From b4de65c19e8008254b57bab119110ed631cbdefc Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Sat, 30 Dec 2000 19:22:22 +0000 Subject: [PATCH] Clean up easily fixed unnecessary includes and exports of implementation header files in layout. b=63766 r=jst@netscape.com sr=buster@netscape.com git-svn-id: svn://10.0.0.236/trunk@84233 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocument.cpp | 6 +++--- .../content/base/src/nsGenericDOMDataNode.cpp | 3 +-- mozilla/content/base/src/nsGenericElement.cpp | 6 +++--- mozilla/content/base/src/nsTextNode.cpp | 1 - mozilla/content/events/src/MANIFEST | 3 --- mozilla/content/events/src/Makefile.in | 4 ---- mozilla/content/events/src/makefile.win | 2 +- .../html/content/src/nsAttributeContent.cpp | 2 +- .../html/content/src/nsGenericHTMLElement.cpp | 6 +++--- .../html/content/src/nsHTMLAnchorElement.cpp | 2 +- .../html/content/src/nsHTMLButtonElement.cpp | 2 +- .../html/content/src/nsHTMLSpacerElement.cpp | 1 - mozilla/content/xbl/src/Makefile.in | 5 ----- mozilla/content/xbl/src/makefile.win | 6 +----- mozilla/content/xml/content/src/Makefile.in | 3 --- mozilla/content/xml/content/src/makefile.win | 6 ++---- .../xml/content/src/nsXMLCDATASection.cpp | 1 - mozilla/content/xml/content/src/nsXMLElement.cpp | 2 +- mozilla/content/xml/document/src/Makefile.in | 2 -- mozilla/content/xml/document/src/makefile.win | 4 ++-- mozilla/content/xul/content/src/nsXULElement.cpp | 3 ++- mozilla/docshell/base/nsWebShell.cpp | 2 +- mozilla/dom/src/base/nsGlobalWindow.cpp | 2 +- mozilla/layout/base/nsCSSFrameConstructor.cpp | 5 ++++- mozilla/layout/base/nsPresContext.cpp | 1 + mozilla/layout/base/nsPresShell.cpp | 8 ++++---- mozilla/layout/base/src/MANIFEST | 1 - mozilla/layout/base/src/Makefile.in | 16 +++++++--------- mozilla/layout/base/src/makefile.win | 2 +- mozilla/layout/base/src/nsDocument.cpp | 6 +++--- mozilla/layout/base/src/nsGenericDOMDataNode.cpp | 3 +-- mozilla/layout/base/src/nsGenericElement.cpp | 6 +++--- mozilla/layout/base/src/nsPresContext.cpp | 1 + mozilla/layout/base/src/nsTextNode.cpp | 1 - mozilla/layout/build/Makefile.in | 1 + mozilla/layout/build/makefile.win | 3 ++- mozilla/layout/events/src/MANIFEST | 3 --- mozilla/layout/events/src/Makefile.in | 4 ---- mozilla/layout/events/src/makefile.win | 2 +- mozilla/layout/forms/nsButtonFrameRenderer.cpp | 2 +- mozilla/layout/forms/nsFileControlFrame.cpp | 5 ++++- mozilla/layout/forms/nsFormControlFrame.cpp | 1 - mozilla/layout/forms/nsFormControlHelper.cpp | 1 - mozilla/layout/forms/nsGfxButtonControlFrame.cpp | 1 + .../layout/forms/nsHTMLButtonControlFrame.cpp | 3 +-- mozilla/layout/forms/nsHTMLButtonControlFrame.h | 3 --- mozilla/layout/forms/nsImageControlFrame.cpp | 3 --- mozilla/layout/forms/nsIsIndexFrame.cpp | 4 +++- mozilla/layout/generic/nsBlockFrame.cpp | 2 +- mozilla/layout/generic/nsBlockReflowState.cpp | 2 +- mozilla/layout/generic/nsBlockReflowState.h | 2 +- mozilla/layout/generic/nsFrame.cpp | 3 +-- mozilla/layout/generic/nsFrameFrame.cpp | 2 +- mozilla/layout/generic/nsFrameSetFrame.cpp | 1 - mozilla/layout/generic/nsHTMLContainerFrame.cpp | 2 +- mozilla/layout/generic/nsHTMLFrame.cpp | 2 +- mozilla/layout/generic/nsImageFrame.cpp | 2 +- mozilla/layout/html/base/src/MANIFEST | 1 - mozilla/layout/html/base/src/Makefile.in | 2 -- mozilla/layout/html/base/src/nsBlockFrame.cpp | 2 +- .../layout/html/base/src/nsBlockReflowState.cpp | 2 +- .../layout/html/base/src/nsBlockReflowState.h | 2 +- mozilla/layout/html/base/src/nsCanvasFrame.cpp | 2 +- mozilla/layout/html/base/src/nsFrame.cpp | 3 +-- mozilla/layout/html/base/src/nsHRFrame.cpp | 1 - .../html/base/src/nsHTMLContainerFrame.cpp | 2 +- mozilla/layout/html/base/src/nsHTMLFrame.cpp | 2 +- mozilla/layout/html/base/src/nsImageFrame.cpp | 2 +- mozilla/layout/html/base/src/nsPresShell.cpp | 8 ++++---- .../html/content/src/nsAttributeContent.cpp | 2 +- .../html/content/src/nsGenericHTMLElement.cpp | 6 +++--- .../html/content/src/nsHTMLAnchorElement.cpp | 2 +- .../html/content/src/nsHTMLButtonElement.cpp | 2 +- .../html/content/src/nsHTMLSpacerElement.cpp | 1 - mozilla/layout/html/document/src/Makefile.in | 4 ---- mozilla/layout/html/document/src/makefile.win | 4 ++-- .../layout/html/document/src/nsFrameFrame.cpp | 2 +- .../layout/html/document/src/nsFrameSetFrame.cpp | 1 - mozilla/layout/html/forms/src/Makefile.in | 1 - mozilla/layout/html/forms/src/makefile.win | 1 - .../html/forms/src/nsButtonFrameRenderer.cpp | 2 +- .../layout/html/forms/src/nsFileControlFrame.cpp | 5 ++++- .../layout/html/forms/src/nsFormControlFrame.cpp | 1 - .../html/forms/src/nsFormControlHelper.cpp | 1 - mozilla/layout/html/forms/src/nsFormFrame.cpp | 3 +-- .../html/forms/src/nsGfxButtonControlFrame.cpp | 1 + .../html/forms/src/nsGfxTextControlFrame.cpp | 2 +- .../html/forms/src/nsHTMLButtonControlFrame.cpp | 3 +-- .../html/forms/src/nsHTMLButtonControlFrame.h | 3 --- .../html/forms/src/nsImageControlFrame.cpp | 3 --- mozilla/layout/html/forms/src/nsIsIndexFrame.cpp | 4 +++- mozilla/layout/html/forms/src/nsLabelFrame.cpp | 2 -- .../html/style/src/nsCSSFrameConstructor.cpp | 5 ++++- mozilla/layout/mathml/base/src/Makefile.in | 3 --- mozilla/layout/mathml/base/src/makefile.win | 4 +--- mozilla/layout/mathml/content/src/Makefile.in | 12 ------------ mozilla/layout/mathml/content/src/makefile.win | 9 ++------- mozilla/layout/xbl/src/Makefile.in | 5 ----- mozilla/layout/xbl/src/makefile.win | 6 +----- mozilla/layout/xml/content/src/Makefile.in | 3 --- mozilla/layout/xml/content/src/makefile.win | 6 ++---- .../layout/xml/content/src/nsXMLCDATASection.cpp | 1 - mozilla/layout/xml/content/src/nsXMLElement.cpp | 2 +- mozilla/layout/xml/document/src/Makefile.in | 2 -- mozilla/layout/xml/document/src/makefile.win | 4 ++-- mozilla/layout/xul/base/src/Makefile.in | 1 - mozilla/layout/xul/base/src/makefile.win | 2 -- mozilla/layout/xul/base/src/nsBoxFrame.cpp | 1 - .../layout/xul/base/src/nsBoxToBlockAdaptor.cpp | 1 - mozilla/layout/xul/base/src/nsContainerBox.cpp | 1 - mozilla/layout/xul/base/src/nsGrippyFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsRootBoxFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsScrollbarFrame.cpp | 1 - mozilla/layout/xul/base/src/nsSliderFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsSplitterFrame.cpp | 3 ++- mozilla/layout/xul/content/src/Makefile.in | 3 ++- mozilla/layout/xul/content/src/makefile.win | 4 +--- mozilla/rdf/content/src/nsXULElement.cpp | 3 ++- 118 files changed, 127 insertions(+), 224 deletions(-) diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 171e2df83ed..e01b3a55697 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -35,12 +35,12 @@ #include "nsIStyleSet.h" #include "nsIStyleSheet.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIDocumentObserver.h" -#include "nsEventListenerManager.h" +#include "nsIEventListenerManager.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptEventListener.h" -#include "nsDOMEvent.h" -#include "nsDOMEventsIIDs.h" +#include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsIEventStateManager.h" #include "nsContentList.h" diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index 5d50cfa0785..476bafdcdce 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -34,14 +34,13 @@ #include "nsIEnumerator.h" #include "nsReadableUtils.h" #include "nsMutationEvent.h" -#include "nsEventListenerManager.h" #include "nsPIDOMWindow.h" #include "nsCRT.h" #include "nsIEventStateManager.h" #include "nsIPrivateDOMEvent.h" #include "nsISizeOfHandler.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIDOMText.h" #include "nsIDOMScriptObjectFactory.h" #include "nsIScriptGlobalObject.h" diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index c05dbbcb4ba..06f874ec09c 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -39,14 +39,15 @@ #include "nsISupportsArray.h" #include "nsIURL.h" #include "nsNetUtil.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsString.h" #include "nsDOMEventsIIDs.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsDOMCID.h" #include "nsIServiceManager.h" @@ -66,7 +67,6 @@ #include "nsIDOMViewCSS.h" #include "nsIXBLService.h" #include "nsPIDOMWindow.h" -#include "nsEventListenerManager.h" #include "nsIBoxObject.h" #include "nsPIBoxObject.h" #include "nsIDOMNSDocument.h" diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp index bec26d8e973..55d11f5196f 100644 --- a/mozilla/content/base/src/nsTextNode.cpp +++ b/mozilla/content/base/src/nsTextNode.cpp @@ -26,7 +26,6 @@ #include "nsIContent.h" #include "nsITextContent.h" #include "nsGenericDOMDataNode.h" -#include "nsFrame.h" #include "nsIDocument.h" #include "nsCRT.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/content/events/src/MANIFEST b/mozilla/content/events/src/MANIFEST index 3f21351764f..f35b75e587c 100644 --- a/mozilla/content/events/src/MANIFEST +++ b/mozilla/content/events/src/MANIFEST @@ -1,7 +1,4 @@ # # This is a list of local files which get copied to the mozilla:dist:layout directory # -nsEventListenerManager.h -nsEventStateManager.h -nsDOMEvent.h nsDOMEventsIIDs.h diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index 098805e2235..d7b1af73655 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/content/events/src/Makefile.in @@ -40,11 +40,7 @@ CPPSRCS = \ $(NULL) EXPORTS = \ - nsEventListenerManager.h \ - nsEventStateManager.h \ - nsDOMEvent.h \ nsDOMEventsIIDs.h \ - nsPrivateTextRange.h \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win index 9709f50ba58..1008f07334f 100644 --- a/mozilla/content/events/src/makefile.win +++ b/mozilla/content/events/src/makefile.win @@ -46,7 +46,7 @@ CPP_OBJS= .\$(OBJDIR)\nsEventListenerManager.obj \ $(NULL) -EXPORTS= nsEventListenerManager.h nsEventStateManager.h nsDOMEvent.h nsDOMEventsIIDs.h nsPrivateTextRange.h +EXPORTS= nsDOMEventsIIDs.h LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \ -I$(PUBLIC)\dom -I$(PUBLIC)\js -I..\..\html\base\src -I$(PUBLIC)\netlib -I..\..\xul\content\src diff --git a/mozilla/content/html/content/src/nsAttributeContent.cpp b/mozilla/content/html/content/src/nsAttributeContent.cpp index 5ba6cd361af..7e0494566b8 100644 --- a/mozilla/content/html/content/src/nsAttributeContent.cpp +++ b/mozilla/content/html/content/src/nsAttributeContent.cpp @@ -38,7 +38,7 @@ #include "nsIEventStateManager.h" #include "nsIPrivateDOMEvent.h" #include "nsISizeOfHandler.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIDOMText.h" #include "nsIDOMScriptObjectFactory.h" #include "prprf.h" diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index fc0bd4806a8..7f5160c0638 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -53,9 +53,10 @@ #include "nsIURL.h" #include "nsNetUtil.h" #include "nsStyleConsts.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsRange.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsINameSpaceManager.h" @@ -72,7 +73,7 @@ #include "nsHTMLAtoms.h" #include "nsDOMEventsIIDs.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsDOMCID.h" #include "nsIServiceManager.h" @@ -89,7 +90,6 @@ #include "nsIDOMMutationEvent.h" #include "nsMutationEvent.h" -#include "nsEventListenerManager.h" #include "nsIBindingManager.h" #include "nsIXBLBinding.h" diff --git a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp index 87ba09d3e5f..2db1d4edcc0 100644 --- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp @@ -38,7 +38,7 @@ #include "nsIURL.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsNetUtil.h" #include "nsCOMPtr.h" diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp index 5a4a4086fe1..a943b9381b1 100644 --- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp @@ -38,7 +38,7 @@ #include "nsIFormControlFrame.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsISizeOfHandler.h" #include "nsIDocument.h" diff --git a/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp b/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp index ff55057aafb..2dcb2c3c16a 100644 --- a/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp @@ -47,7 +47,6 @@ #include "nsLayoutUtils.h" #include "nsIWebShell.h" #include "nsIFrame.h" -#include "nsImageFrame.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index f70f9865d04..f8024b101d6 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/content/xbl/src/Makefile.in @@ -64,14 +64,9 @@ DEFINES += -D_IMPL_NS_HTML LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ - -I$(srcdir)/../../html/table/src \ -I$(srcdir)/../../html/style/src \ -I$(srcdir)/../../html/base/src \ - -I$(srcdir)/../../html/forms/src \ - -I$(srcdir)/../../html/content/src \ -I$(srcdir)/../../html/document/src \ - -I$(srcdir)/../../xml/content/src \ -I$(srcdir)/../../xml/document/src \ - -I$(srcdir)/../../base/public \ $(NULL) diff --git a/mozilla/content/xbl/src/makefile.win b/mozilla/content/xbl/src/makefile.win index 23f1f164600..25c495384bb 100644 --- a/mozilla/content/xbl/src/makefile.win +++ b/mozilla/content/xbl/src/makefile.win @@ -76,15 +76,11 @@ EXPORTS = \ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ -I..\..\html\style\src -I..\..\html\base\src -I$(PUBLIC)\dom \ -I..\..\html\document\src \ - -I..\..\html\content\src \ - -I..\..\html\table\src \ - -I..\..\html\forms\src \ -I$(PUBLIC)\netlib \ -I$(PUBLIC)\pref \ - -I..\..\xml\content\src \ -I..\..\xml\document\src \ -I..\..\base\src \ - -I..\public + $(NULL) LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 11a4715ee3b..a3b29a4d238 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -49,9 +49,6 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_HTML INCLUDES += \ - -I$(srcdir)/../../../html/base/src \ - -I$(srcdir)/../../../html/document/src \ - -I$(srcdir)/../../../html/style/src \ -I$(srcdir)/../../../base/src \ $(NULL) diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win index 24b67d769f6..ff3849f87da 100644 --- a/mozilla/content/xml/content/src/makefile.win +++ b/mozilla/content/xml/content/src/makefile.win @@ -46,12 +46,10 @@ CPP_OBJS= \ .\$(OBJDIR)\nsXMLNamedNodeMap.obj \ $(NULL) -EXPORTS = \ +LINCS= \ + -I..\..\..\base\src \ $(NULL) -LINCS= -I..\..\..\html\style\src -I..\..\..\html\base\src \ - -I..\..\..\html\document\src -I..\..\..\base\src - LCFLAGS = \ $(LCFLAGS) \ $(DEFINES) \ diff --git a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp index 4ac16673bcf..ae1835a77cf 100644 --- a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp +++ b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp @@ -26,7 +26,6 @@ #include "nsIContent.h" #include "nsITextContent.h" #include "nsGenericDOMDataNode.h" -#include "nsFrame.h" #include "nsIDocument.h" #include "nsCRT.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp index 4bc62dee03a..929688c119d 100644 --- a/mozilla/content/xml/content/src/nsXMLElement.cpp +++ b/mozilla/content/xml/content/src/nsXMLElement.cpp @@ -28,7 +28,7 @@ #include "nsIDOMScriptObjectFactory.h" #include "nsIWebShell.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsINameSpace.h" #include "nsINameSpaceManager.h" #include "nsINodeInfo.h" diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index 0f06066d8a8..1f248cc8266 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -48,8 +48,6 @@ INCLUDES += \ -I$(srcdir)/../../../xsl/document/src \ -I$(srcdir)/../../../html/base/src \ -I$(srcdir)/../../../html/document/src \ - -I$(srcdir)/../../../html/content/src \ - -I$(srcdir)/../../../html/style/src \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../../xul/content/src \ $(NULL) diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win index c80497632e3..3640928306c 100644 --- a/mozilla/content/xml/document/src/makefile.win +++ b/mozilla/content/xml/document/src/makefile.win @@ -40,8 +40,8 @@ EXPORTS = \ $(NULL) LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ - -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \ - -I..\..\..\html\content\src -I..\..\..\html\document\src \ + -I..\..\..\html\base\src -I$(PUBLIC)\dom \ + -I..\..\..\html\document\src \ -I..\..\..\xul\content\src -I..\..\..\xsl\document\src \ -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \ -I$(PUBLIC)\expat diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index b4986bfe9f9..e21ddd5357e 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -52,7 +52,8 @@ #include "nsCOMPtr.h" #include "nsDOMCID.h" #include "nsDOMError.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" +#include "nsIPrivateDOMEvent.h" #include "nsForwardReference.h" #include "nsHTMLValue.h" #include "nsHashtable.h" diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 68f55561f66..86bd29b344c 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -52,7 +52,7 @@ typedef unsigned long HMTX; #include "nsIRefreshURI.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptGlobalObjectOwner.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIPresContext.h" #include "nsIComponentManager.h" #include "nsIServiceManager.h" diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 53291244781..319e4618048 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -38,7 +38,7 @@ #include "nsReadableUtils.h" // Other Classes -#include "nsEventListenerManager.h" +#include "nsIEventListenerManager.h" #include "nsEscape.h" #include "nsDOMPropEnums.h" #include "nsStyleCoord.h" diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 9ff203bfa5f..234edda4d0a 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -135,10 +135,13 @@ nsresult NS_NewPolylineFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); #endif -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsIDOMElement.h" +#include "nsIDOMNodeList.h" #include "nsIDOMDocument.h" +#include "nsIDOMDocumentXBL.h" #include "nsIScrollable.h" +#include "nsINodeInfo.h" #ifdef DEBUG static PRBool gNoisyContentUpdates = PR_FALSE; diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp index 043258ff9e8..bc3390c5014 100644 --- a/mozilla/layout/base/nsPresContext.cpp +++ b/mozilla/layout/base/nsPresContext.cpp @@ -41,6 +41,7 @@ #include "nsFrameImageLoader.h" #include "nsIFrameManager.h" #include "nsIImageGroup.h" +#include "nsIContent.h" #include "nsIFrame.h" #include "nsIRenderingContext.h" #include "nsEventStateManager.h" diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index fd1ee004055..6b12c92ec28 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -62,7 +62,7 @@ #include "nsHTMLIIDs.h" #include "nsIDeviceContext.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsHTMLParts.h" #include "nsISelection.h" #include "nsISelectionController.h" @@ -1197,14 +1197,14 @@ NS_NewPresShell(nsIPresShell** aInstancePtrResult) (void **) aInstancePtrResult); } -PresShell::PresShell():mStackArena(nsnull), +PresShell::PresShell():mAnonymousContentTable(nsnull), + mStackArena(nsnull), mFirstDOMEventRequest(nsnull), mLastDOMEventRequest(nsnull), mFirstAttributeRequest(nsnull), mLastAttributeRequest(nsnull), mFirstCallbackEventRequest(nsnull), - mLastCallbackEventRequest(nsnull), - mAnonymousContentTable(nsnull) + mLastCallbackEventRequest(nsnull) { NS_INIT_REFCNT(); mIsDestroying = PR_FALSE; diff --git a/mozilla/layout/base/src/MANIFEST b/mozilla/layout/base/src/MANIFEST index df710664707..638ae4852f4 100644 --- a/mozilla/layout/base/src/MANIFEST +++ b/mozilla/layout/base/src/MANIFEST @@ -2,4 +2,3 @@ # This is a list of local files which get copied to the mozilla:dist:layout directory # nsContentList.h -nsNodeInfoManager.h diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in index dec21bef375..d301c3422b4 100644 --- a/mozilla/layout/base/src/Makefile.in +++ b/mozilla/layout/base/src/Makefile.in @@ -79,13 +79,6 @@ CPPSRCS = \ nsPlainTextSerializer.cpp \ $(NULL) -EXPORTS = \ - nsDocument.h \ - nsNodeInfoManager.h \ - $(NULL) - -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - # we don't want the shared lib, but we want to force the creation of a static lib. override NO_SHARED_LIB=1 override NO_STATIC_LIB= @@ -94,5 +87,10 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_LAYOUT -INCLUDES += -I$(srcdir)/../../html/base/src -I$(srcdir)/../../html/style/src -I$(srcdir)/../../xul/base/src -I$(srcdir)/../../xul/content/src - +INCLUDES += \ + -I$(srcdir)/../../events/src \ + -I$(srcdir)/../../html/base/src \ + -I$(srcdir)/../../html/style/src \ + -I$(srcdir)/../../xul/base/src \ + -I$(srcdir)/../../xul/content/src \ + $(NULL) diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win index 3b3fe9d2566..31747e4bf12 100644 --- a/mozilla/layout/base/src/makefile.win +++ b/mozilla/layout/base/src/makefile.win @@ -77,7 +77,6 @@ CPPSRCS = \ $(NULL) MODULE=raptor -# EXPORTS= CPP_OBJS= \ .\$(OBJDIR)\nsAutoCopy.obj \ @@ -132,6 +131,7 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \ -I$(PUBLIC)\dom -I$(PUBLIC)\js -I$(PUBLIC)\netlib \ -I$(PUBLIC)\pref -I..\..\html\base\src -I..\..\html\style\src \ -I..\..\xul\base\src -I..\..\xul\content\src \ + -I..\..\events\src \ -I$(PUBLIC)\lwbrk -I$(PUBLIC)\plugin LCFLAGS = \ diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index 171e2df83ed..e01b3a55697 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -35,12 +35,12 @@ #include "nsIStyleSet.h" #include "nsIStyleSheet.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIDocumentObserver.h" -#include "nsEventListenerManager.h" +#include "nsIEventListenerManager.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptEventListener.h" -#include "nsDOMEvent.h" -#include "nsDOMEventsIIDs.h" +#include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsIEventStateManager.h" #include "nsContentList.h" diff --git a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp index 5d50cfa0785..476bafdcdce 100644 --- a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp @@ -34,14 +34,13 @@ #include "nsIEnumerator.h" #include "nsReadableUtils.h" #include "nsMutationEvent.h" -#include "nsEventListenerManager.h" #include "nsPIDOMWindow.h" #include "nsCRT.h" #include "nsIEventStateManager.h" #include "nsIPrivateDOMEvent.h" #include "nsISizeOfHandler.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIDOMText.h" #include "nsIDOMScriptObjectFactory.h" #include "nsIScriptGlobalObject.h" diff --git a/mozilla/layout/base/src/nsGenericElement.cpp b/mozilla/layout/base/src/nsGenericElement.cpp index c05dbbcb4ba..06f874ec09c 100644 --- a/mozilla/layout/base/src/nsGenericElement.cpp +++ b/mozilla/layout/base/src/nsGenericElement.cpp @@ -39,14 +39,15 @@ #include "nsISupportsArray.h" #include "nsIURL.h" #include "nsNetUtil.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsString.h" #include "nsDOMEventsIIDs.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsDOMCID.h" #include "nsIServiceManager.h" @@ -66,7 +67,6 @@ #include "nsIDOMViewCSS.h" #include "nsIXBLService.h" #include "nsPIDOMWindow.h" -#include "nsEventListenerManager.h" #include "nsIBoxObject.h" #include "nsPIBoxObject.h" #include "nsIDOMNSDocument.h" diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp index 043258ff9e8..bc3390c5014 100644 --- a/mozilla/layout/base/src/nsPresContext.cpp +++ b/mozilla/layout/base/src/nsPresContext.cpp @@ -41,6 +41,7 @@ #include "nsFrameImageLoader.h" #include "nsIFrameManager.h" #include "nsIImageGroup.h" +#include "nsIContent.h" #include "nsIFrame.h" #include "nsIRenderingContext.h" #include "nsEventStateManager.h" diff --git a/mozilla/layout/base/src/nsTextNode.cpp b/mozilla/layout/base/src/nsTextNode.cpp index bec26d8e973..55d11f5196f 100644 --- a/mozilla/layout/base/src/nsTextNode.cpp +++ b/mozilla/layout/base/src/nsTextNode.cpp @@ -26,7 +26,6 @@ #include "nsIContent.h" #include "nsITextContent.h" #include "nsGenericDOMDataNode.h" -#include "nsFrame.h" #include "nsIDocument.h" #include "nsCRT.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 7a23415c775..4e434920633 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -103,6 +103,7 @@ DEFINES += -D_IMPL_NS_HTML INCLUDES += -I$(srcdir)/../base/src \ -I$(srcdir)/../html/base/src \ + -I$(srcdir)/../html/style/src \ -I$(srcdir)/../xul/content/src \ -I$(srcdir)/../xul/base/src \ $(NULL) diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index 86f214484bf..63b5a0c22ba 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -51,7 +51,8 @@ LCFLAGS = \ $(NULL) LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \ - -I$(PUBLIC)\js -I..\..\style\src -I..\html\base\src -I..\base\src \ + -I$(PUBLIC)\js -I..\html\base\src -I..\base\src \ + -I..\html\style\src \ -I..\xul\content\src \ -I..\xul\base\src \ !ifdef MOZ_MATHML diff --git a/mozilla/layout/events/src/MANIFEST b/mozilla/layout/events/src/MANIFEST index 3f21351764f..f35b75e587c 100644 --- a/mozilla/layout/events/src/MANIFEST +++ b/mozilla/layout/events/src/MANIFEST @@ -1,7 +1,4 @@ # # This is a list of local files which get copied to the mozilla:dist:layout directory # -nsEventListenerManager.h -nsEventStateManager.h -nsDOMEvent.h nsDOMEventsIIDs.h diff --git a/mozilla/layout/events/src/Makefile.in b/mozilla/layout/events/src/Makefile.in index 098805e2235..d7b1af73655 100644 --- a/mozilla/layout/events/src/Makefile.in +++ b/mozilla/layout/events/src/Makefile.in @@ -40,11 +40,7 @@ CPPSRCS = \ $(NULL) EXPORTS = \ - nsEventListenerManager.h \ - nsEventStateManager.h \ - nsDOMEvent.h \ nsDOMEventsIIDs.h \ - nsPrivateTextRange.h \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/layout/events/src/makefile.win b/mozilla/layout/events/src/makefile.win index 9709f50ba58..1008f07334f 100644 --- a/mozilla/layout/events/src/makefile.win +++ b/mozilla/layout/events/src/makefile.win @@ -46,7 +46,7 @@ CPP_OBJS= .\$(OBJDIR)\nsEventListenerManager.obj \ $(NULL) -EXPORTS= nsEventListenerManager.h nsEventStateManager.h nsDOMEvent.h nsDOMEventsIIDs.h nsPrivateTextRange.h +EXPORTS= nsDOMEventsIIDs.h LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \ -I$(PUBLIC)\dom -I$(PUBLIC)\js -I..\..\html\base\src -I$(PUBLIC)\netlib -I..\..\xul\content\src diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp index d90e7a13c82..789f676b8bf 100644 --- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp @@ -23,10 +23,10 @@ #include "nsIRenderingContext.h" #include "nsCSSRendering.h" #include "nsIPresContext.h" -#include "nsGenericHTMLElement.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsHTMLAtoms.h" +#include "nsINameSpaceManager.h" #define ACTIVE "active" #define HOVER "hover" diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 6489966a1f7..64f47def9c1 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -44,7 +44,7 @@ #include "nsISupportsArray.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsIDOMMouseListener.h" #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" @@ -54,6 +54,9 @@ #include "nsIDOMWindowInternal.h" #include "nsIFilePicker.h" #include "nsIDOMMouseEvent.h" +#include "nsINodeInfo.h" +#include "nsIDOMEventReceiver.h" +#include "nsIScriptGlobalObject.h" static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index fcc8f971e48..2a0badaeb36 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -37,7 +37,6 @@ #include "nsViewsCID.h" #include "nsIComponentManager.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" #include "nsIFontMetrics.h" #include "nsIFormControl.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 324f58cb815..46c558ab644 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -37,7 +37,6 @@ #include "nsViewsCID.h" #include "nsIComponentManager.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" #include "nsIFontMetrics.h" #include "nsIFormControl.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index 3923e83f30b..a7ba72dabc9 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -26,6 +26,7 @@ #include "nsIFontMetrics.h" #include "nsFormControlFrame.h" #include "nsISupportsArray.h" +#include "nsINameSpaceManager.h" const nscoord kSuggestedNotSet = -1; diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 671808943ba..cfd6f7f615b 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -41,10 +41,8 @@ #include "nsHTMLAtoms.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsStyleConsts.h" #include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsIView.h" @@ -55,6 +53,7 @@ #include "nsButtonFrameRenderer.h" #include "nsFormControlFrame.h" #include "nsIFrameManager.h" +#include "nsINameSpaceManager.h" static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.h b/mozilla/layout/forms/nsHTMLButtonControlFrame.h index 3d2bc58ae95..d4eaa47f4a5 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.h @@ -42,10 +42,7 @@ #include "nsHTMLAtoms.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsStyleConsts.h" -#include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsIView.h" diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index 7632dc8823d..83da4c09cd2 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -41,10 +41,7 @@ #include "nsIFontMetrics.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsStyleConsts.h" -#include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsFormFrame.h" #include "nsFormControlFrame.h" diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index 2b1bb7dc2de..17063c2447a 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -40,7 +40,7 @@ #include "nsISupportsArray.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" #include "nsIStatefulFrame.h" @@ -58,6 +58,8 @@ #include "nsIDOMKeyListener.h" #include "nsIDOMKeyEvent.h" #include "nsIFormControlFrame.h" +#include "nsINodeInfo.h" +#include "nsIDOMEventReceiver.h" static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 95cb010bea4..6ba65c8bb8a 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -45,7 +45,7 @@ #include "nsHTMLParts.h" #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 95cb010bea4..6ba65c8bb8a 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -45,7 +45,7 @@ #include "nsHTMLParts.h" #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 95cb010bea4..6ba65c8bb8a 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -45,7 +45,7 @@ #include "nsHTMLParts.h" #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 44a31333177..2fc2555bb00 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -34,7 +34,7 @@ #include "nsIPresContext.h" #include "nsCRT.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIPresShell.h" #include "prlog.h" @@ -45,7 +45,6 @@ #include "nsIFrameManager.h" #include "nsIDOMText.h" -#include "nsDocument.h" #include "nsIDeviceContext.h" #include "nsHTMLIIDs.h" #include "nsIEventStateManager.h" diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 1d4127d968e..e38103a8134 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -56,13 +56,13 @@ #include "nsFrameSetFrame.h" #include "nsIDOMHTMLFrameElement.h" #include "nsIDOMHTMLIFrameElement.h" -#include "nsGenericHTMLElement.h" #include "nsLayoutAtoms.h" #include "nsIChromeEventHandler.h" #include "nsIScriptSecurityManager.h" #include "nsICodebasePrincipal.h" #include "nsXPIDLString.h" #include "nsIScrollable.h" +#include "nsINameSpaceManager.h" #ifdef INCLUDE_XUL #include "nsIDOMXULElement.h" diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 376601f650e..3de33d3c6c4 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -42,7 +42,6 @@ #include "nsStyleConsts.h" #include "nsIStyleContext.h" #include "nsIDocumentLoader.h" -#include "nsGenericHTMLElement.h" #include "nsHTMLParts.h" #include "nsILookAndFeel.h" #include "nsWidgetsCID.h" diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 5c9b8446e1d..b45cb5508fb 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -43,7 +43,7 @@ #include "nsViewsCID.h" #include "nsIReflowCommand.h" #include "nsHTMLIIDs.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIScrollableView.h" #include "nsWidgetsCID.h" #include "nsIStyleSet.h" diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index fe8f6a647fd..460ba4e9639 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -34,7 +34,7 @@ #include "nsPageFrame.h" #include "nsIRenderingContext.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIViewManager.h" #include "nsHTMLAtoms.h" diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 0b9fe558996..99c5b7b431e 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -31,7 +31,7 @@ #include "nsIImage.h" #include "nsIWidget.h" #include "nsHTMLAtoms.h" -#include "nsIHTMLAttributes.h" +#include "nsIHTMLContent.h" #include "nsIDocument.h" #include "nsIHTMLDocument.h" #include "nsIStyleContext.h" diff --git a/mozilla/layout/html/base/src/MANIFEST b/mozilla/layout/html/base/src/MANIFEST index c8ec688e57f..adf0e1af91d 100644 --- a/mozilla/layout/html/base/src/MANIFEST +++ b/mozilla/layout/html/base/src/MANIFEST @@ -2,6 +2,5 @@ # This is a list of local files which get copied to the mozilla:dist:layout directory # -nsBlockBandData.h nsILineIterator.h nsIHTMLContent.h diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 8f6f9ef0884..7a37c29dc1e 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -106,10 +106,8 @@ INCLUDES += \ -I$(srcdir)/../../../xul/base/src \ -I$(srcdir)/../../../xul/content/src \ -I$(srcdir)/../../style/src \ - -I$(srcdir)/../../content/src \ -I$(srcdir)/../../../base/src \ -I$(srcdir) \ - -I$(DIST)/oji \ $(NULL) install:: diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 95cb010bea4..6ba65c8bb8a 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -45,7 +45,7 @@ #include "nsHTMLParts.h" #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 95cb010bea4..6ba65c8bb8a 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -45,7 +45,7 @@ #include "nsHTMLParts.h" #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 95cb010bea4..6ba65c8bb8a 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -45,7 +45,7 @@ #include "nsHTMLParts.h" #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/html/base/src/nsCanvasFrame.cpp b/mozilla/layout/html/base/src/nsCanvasFrame.cpp index d16b29f0532..21b687402d8 100644 --- a/mozilla/layout/html/base/src/nsCanvasFrame.cpp +++ b/mozilla/layout/html/base/src/nsCanvasFrame.cpp @@ -34,7 +34,7 @@ #include "nsPageFrame.h" #include "nsIRenderingContext.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIViewManager.h" #include "nsHTMLAtoms.h" diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 44a31333177..2fc2555bb00 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -34,7 +34,7 @@ #include "nsIPresContext.h" #include "nsCRT.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIPresShell.h" #include "prlog.h" @@ -45,7 +45,6 @@ #include "nsIFrameManager.h" #include "nsIDOMText.h" -#include "nsDocument.h" #include "nsIDeviceContext.h" #include "nsHTMLIIDs.h" #include "nsIEventStateManager.h" diff --git a/mozilla/layout/html/base/src/nsHRFrame.cpp b/mozilla/layout/html/base/src/nsHRFrame.cpp index f3dca520e3a..82b2ff45ced 100644 --- a/mozilla/layout/html/base/src/nsHRFrame.cpp +++ b/mozilla/layout/html/base/src/nsHRFrame.cpp @@ -31,7 +31,6 @@ #include "nsHTMLIIDs.h" #include "nsHTMLAtoms.h" #include "nsIFontMetrics.h" -#include "nsIHTMLAttributes.h" #include "nsStyleConsts.h" #include "nsCSSRendering.h" #include "nsIDOMHTMLHRElement.h" diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index 5c9b8446e1d..b45cb5508fb 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -43,7 +43,7 @@ #include "nsViewsCID.h" #include "nsIReflowCommand.h" #include "nsHTMLIIDs.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIScrollableView.h" #include "nsWidgetsCID.h" #include "nsIStyleSet.h" diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index fe8f6a647fd..460ba4e9639 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -34,7 +34,7 @@ #include "nsPageFrame.h" #include "nsIRenderingContext.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIViewManager.h" #include "nsHTMLAtoms.h" diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 0b9fe558996..99c5b7b431e 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -31,7 +31,7 @@ #include "nsIImage.h" #include "nsIWidget.h" #include "nsHTMLAtoms.h" -#include "nsIHTMLAttributes.h" +#include "nsIHTMLContent.h" #include "nsIDocument.h" #include "nsIHTMLDocument.h" #include "nsIStyleContext.h" diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index fd1ee004055..6b12c92ec28 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -62,7 +62,7 @@ #include "nsHTMLIIDs.h" #include "nsIDeviceContext.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsHTMLParts.h" #include "nsISelection.h" #include "nsISelectionController.h" @@ -1197,14 +1197,14 @@ NS_NewPresShell(nsIPresShell** aInstancePtrResult) (void **) aInstancePtrResult); } -PresShell::PresShell():mStackArena(nsnull), +PresShell::PresShell():mAnonymousContentTable(nsnull), + mStackArena(nsnull), mFirstDOMEventRequest(nsnull), mLastDOMEventRequest(nsnull), mFirstAttributeRequest(nsnull), mLastAttributeRequest(nsnull), mFirstCallbackEventRequest(nsnull), - mLastCallbackEventRequest(nsnull), - mAnonymousContentTable(nsnull) + mLastCallbackEventRequest(nsnull) { NS_INIT_REFCNT(); mIsDestroying = PR_FALSE; diff --git a/mozilla/layout/html/content/src/nsAttributeContent.cpp b/mozilla/layout/html/content/src/nsAttributeContent.cpp index 5ba6cd361af..7e0494566b8 100644 --- a/mozilla/layout/html/content/src/nsAttributeContent.cpp +++ b/mozilla/layout/html/content/src/nsAttributeContent.cpp @@ -38,7 +38,7 @@ #include "nsIEventStateManager.h" #include "nsIPrivateDOMEvent.h" #include "nsISizeOfHandler.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIDOMText.h" #include "nsIDOMScriptObjectFactory.h" #include "prprf.h" diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp index fc0bd4806a8..7f5160c0638 100644 --- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp @@ -53,9 +53,10 @@ #include "nsIURL.h" #include "nsNetUtil.h" #include "nsStyleConsts.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsRange.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsINameSpaceManager.h" @@ -72,7 +73,7 @@ #include "nsHTMLAtoms.h" #include "nsDOMEventsIIDs.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsDOMCID.h" #include "nsIServiceManager.h" @@ -89,7 +90,6 @@ #include "nsIDOMMutationEvent.h" #include "nsMutationEvent.h" -#include "nsEventListenerManager.h" #include "nsIBindingManager.h" #include "nsIXBLBinding.h" diff --git a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp index 87ba09d3e5f..2db1d4edcc0 100644 --- a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp @@ -38,7 +38,7 @@ #include "nsIURL.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsNetUtil.h" #include "nsCOMPtr.h" diff --git a/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp b/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp index 5a4a4086fe1..a943b9381b1 100644 --- a/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp @@ -38,7 +38,7 @@ #include "nsIFormControlFrame.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsISizeOfHandler.h" #include "nsIDocument.h" diff --git a/mozilla/layout/html/content/src/nsHTMLSpacerElement.cpp b/mozilla/layout/html/content/src/nsHTMLSpacerElement.cpp index ff55057aafb..2dcb2c3c16a 100644 --- a/mozilla/layout/html/content/src/nsHTMLSpacerElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLSpacerElement.cpp @@ -47,7 +47,6 @@ #include "nsLayoutUtils.h" #include "nsIWebShell.h" #include "nsIFrame.h" -#include "nsImageFrame.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index 89282e21d0d..2522007cf4b 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -59,10 +59,6 @@ INCLUDES += \ -I$(srcdir)/../../base/src \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../content/src \ - -I$(srcdir)/../../forms/src \ - -I$(srcdir)/../../style/src \ - -I$(srcdir)/../../table/src \ - -I$(srcdir)/../../dom \ $(NULL) GARBAGE += $(DIST)/bin/res/ua.css $(DIST)/bin/res/html.css $(DIST)/bin/res/forms.css $(DIST)/bin/res/quirk.css $(DIST)/bin/res/arrow.gif diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index 8ae26348fc9..d8d6ef0bab5 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -55,8 +55,8 @@ EXPORTS = \ $(NULL) LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ - -I..\..\base\src -I..\..\forms\src \ - -I..\..\style\src -I..\..\table\src -I$(PUBLIC)\dom \ + -I..\..\base\src \ + -I$(PUBLIC)\dom \ -I..\..\content\src \ -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 1d4127d968e..e38103a8134 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -56,13 +56,13 @@ #include "nsFrameSetFrame.h" #include "nsIDOMHTMLFrameElement.h" #include "nsIDOMHTMLIFrameElement.h" -#include "nsGenericHTMLElement.h" #include "nsLayoutAtoms.h" #include "nsIChromeEventHandler.h" #include "nsIScriptSecurityManager.h" #include "nsICodebasePrincipal.h" #include "nsXPIDLString.h" #include "nsIScrollable.h" +#include "nsINameSpaceManager.h" #ifdef INCLUDE_XUL #include "nsIDOMXULElement.h" diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index 376601f650e..3de33d3c6c4 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -42,7 +42,6 @@ #include "nsStyleConsts.h" #include "nsIStyleContext.h" #include "nsIDocumentLoader.h" -#include "nsGenericHTMLElement.h" #include "nsHTMLParts.h" #include "nsILookAndFeel.h" #include "nsWidgetsCID.h" diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index 82d56594807..6f75ee2d337 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -77,7 +77,6 @@ INCLUDES += \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../base/src \ -I$(srcdir)/../../style/src \ - -I$(srcdir)/../../content/src \ -I$(srcdir)/../../../xul/base/src \ $(NULL) diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index f0a3816521b..f78b8c93325 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -82,7 +82,6 @@ LINCS= -I$(PUBLIC)\xpcom \ -I..\..\style\src \ -I..\..\..\base\src \ -I..\..\..\xul\base\src \ - -I..\..\content\src \ -I$(PUBLIC)\uconv diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp index d90e7a13c82..789f676b8bf 100644 --- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp +++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp @@ -23,10 +23,10 @@ #include "nsIRenderingContext.h" #include "nsCSSRendering.h" #include "nsIPresContext.h" -#include "nsGenericHTMLElement.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsHTMLAtoms.h" +#include "nsINameSpaceManager.h" #define ACTIVE "active" #define HOVER "hover" diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index 6489966a1f7..64f47def9c1 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -44,7 +44,7 @@ #include "nsISupportsArray.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsIDOMMouseListener.h" #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" @@ -54,6 +54,9 @@ #include "nsIDOMWindowInternal.h" #include "nsIFilePicker.h" #include "nsIDOMMouseEvent.h" +#include "nsINodeInfo.h" +#include "nsIDOMEventReceiver.h" +#include "nsIScriptGlobalObject.h" static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index fcc8f971e48..2a0badaeb36 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -37,7 +37,6 @@ #include "nsViewsCID.h" #include "nsIComponentManager.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" #include "nsIFontMetrics.h" #include "nsIFormControl.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 324f58cb815..46c558ab644 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -37,7 +37,6 @@ #include "nsViewsCID.h" #include "nsIComponentManager.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" #include "nsIFontMetrics.h" #include "nsIFormControl.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp index b63cff7187d..fb8ab7f45e1 100644 --- a/mozilla/layout/html/forms/src/nsFormFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp @@ -55,10 +55,10 @@ #include "nsIWidget.h" #include "nsVoidArray.h" #include "nsHTMLAtoms.h" -#include "nsIHTMLAttributes.h" #include "nsCRT.h" #include "nsIURL.h" #include "nsIHTMLDocument.h" +#include "nsIScriptGlobalObject.h" #include "nsIFormProcessor.h" @@ -69,7 +69,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIDocument.h" #include "nsILinkHandler.h" #include "nsGfxRadioControlFrame.h" -#include "nsDocument.h" #include "nsIDOMHTMLFormElement.h" #include "nsIDOMNSHTMLFormElement.h" #include "nsDOMError.h" diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp index 3923e83f30b..a7ba72dabc9 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp @@ -26,6 +26,7 @@ #include "nsIFontMetrics.h" #include "nsFormControlFrame.h" #include "nsISupportsArray.h" +#include "nsINameSpaceManager.h" const nscoord kSuggestedNotSet = -1; diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp index 0390ed50883..60d93404111 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -40,7 +40,7 @@ #include "nsHTMLAtoms.h" #include "nsIStyleContext.h" #include "nsFont.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsIFormControl.h" #include "nsFormFrame.h" #include "nsIFrameManager.h" diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index 671808943ba..cfd6f7f615b 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -41,10 +41,8 @@ #include "nsHTMLAtoms.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsStyleConsts.h" #include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsIView.h" @@ -55,6 +53,7 @@ #include "nsButtonFrameRenderer.h" #include "nsFormControlFrame.h" #include "nsIFrameManager.h" +#include "nsINameSpaceManager.h" static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h index 3d2bc58ae95..d4eaa47f4a5 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h @@ -42,10 +42,7 @@ #include "nsHTMLAtoms.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsStyleConsts.h" -#include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsIView.h" diff --git a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp index 7632dc8823d..83da4c09cd2 100644 --- a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp @@ -41,10 +41,7 @@ #include "nsIFontMetrics.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsStyleConsts.h" -#include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsFormFrame.h" #include "nsFormControlFrame.h" diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp index 2b1bb7dc2de..17063c2447a 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp @@ -40,7 +40,7 @@ #include "nsISupportsArray.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" #include "nsIStatefulFrame.h" @@ -58,6 +58,8 @@ #include "nsIDOMKeyListener.h" #include "nsIDOMKeyEvent.h" #include "nsIFormControlFrame.h" +#include "nsINodeInfo.h" +#include "nsIDOMEventReceiver.h" static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); diff --git a/mozilla/layout/html/forms/src/nsLabelFrame.cpp b/mozilla/layout/html/forms/src/nsLabelFrame.cpp index 56a87c82f66..8d0c4a98ddf 100644 --- a/mozilla/layout/html/forms/src/nsLabelFrame.cpp +++ b/mozilla/layout/html/forms/src/nsLabelFrame.cpp @@ -40,11 +40,9 @@ #include "nsHTMLAtoms.h" #include "nsIImage.h" #include "nsStyleUtil.h" -#include "nsDOMEvent.h" #include "nsIDOMHTMLCollection.h" #include "nsStyleConsts.h" #include "nsIHTMLAttributes.h" -#include "nsGenericHTMLElement.h" #include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsIView.h" diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 9ff203bfa5f..234edda4d0a 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -135,10 +135,13 @@ nsresult NS_NewPolylineFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); #endif -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsIDOMElement.h" +#include "nsIDOMNodeList.h" #include "nsIDOMDocument.h" +#include "nsIDOMDocumentXBL.h" #include "nsIScrollable.h" +#include "nsINodeInfo.h" #ifdef DEBUG static PRBool gNoisyContentUpdates = PR_FALSE; diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index 1f485bb3a5b..8f8c044896c 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/layout/mathml/base/src/Makefile.in @@ -32,11 +32,8 @@ LIBRARY_NAME = gkmathmlbase_s REQUIRES = xpcom js dom widget webshell locale view htmlparser necko docshell webbrwsr LOCAL_INCLUDES = \ - -I$(srcdir)/../../../base/src \ - -I$(srcdir)/../../../base/public \ -I$(srcdir)/../../../html/style/src \ -I$(srcdir)/../../../html/base/src \ - -I$(srcdir)/../../../html/content/src \ -I$(srcdir)/../../../html/table/src \ -I$(srcdir)/../../content/src \ $(NULL) diff --git a/mozilla/layout/mathml/base/src/makefile.win b/mozilla/layout/mathml/base/src/makefile.win index 35f232f6b12..e59fe2b8a5f 100644 --- a/mozilla/layout/mathml/base/src/makefile.win +++ b/mozilla/layout/mathml/base/src/makefile.win @@ -85,12 +85,10 @@ EXPORTS = \ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ -I..\..\..\html\style\src \ -I..\..\..\html\base\src \ - -I..\..\..\html\content\src \ -I..\..\..\html\table\src \ -I$(PUBLIC)\dom \ -I..\..\content\src \ - -I..\..\..\base\public \ - -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref + -I$(PUBLIC)\netlib -I$(PUBLIC)\pref LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index 68304276ebe..538d7183201 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/layout/mathml/content/src/Makefile.in @@ -36,24 +36,12 @@ include $(topsrcdir)/config/config.mk DEFINES += -D_IMPL_NS_HTML -INCLUDES += \ - -I$(srcdir)/../../../base/src \ - $(NULL) - CPPSRCS = \ nsMathMLAtoms.cpp \ nsMathMLOperators.cpp \ $(NULL) -EXPORTS = \ - nsMathMLOperators.h \ - nsMathMLOperatorList.h \ - $(NULL) - -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - - MKSHLIB := # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/mozilla/layout/mathml/content/src/makefile.win b/mozilla/layout/mathml/content/src/makefile.win index 1125876aaca..7cfd4f93a92 100644 --- a/mozilla/layout/mathml/content/src/makefile.win +++ b/mozilla/layout/mathml/content/src/makefile.win @@ -28,10 +28,6 @@ MODULE=raptor DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN -EXPORTS = nsMathMLOperators.h \ - nsMathMLOperatorList.h \ - $(NULL) - CPPSRCS= \ nsMathMLAtoms.cpp \ nsMathMLOperators.cpp \ @@ -43,9 +39,8 @@ CPP_OBJS= \ $(NULL) LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ - -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \ - -I..\..\..\html\document\src \ - -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref + -I$(PUBLIC)\dom \ + -I$(PUBLIC)\netlib -I$(PUBLIC)\pref LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/layout/xbl/src/Makefile.in b/mozilla/layout/xbl/src/Makefile.in index f70f9865d04..f8024b101d6 100644 --- a/mozilla/layout/xbl/src/Makefile.in +++ b/mozilla/layout/xbl/src/Makefile.in @@ -64,14 +64,9 @@ DEFINES += -D_IMPL_NS_HTML LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ - -I$(srcdir)/../../html/table/src \ -I$(srcdir)/../../html/style/src \ -I$(srcdir)/../../html/base/src \ - -I$(srcdir)/../../html/forms/src \ - -I$(srcdir)/../../html/content/src \ -I$(srcdir)/../../html/document/src \ - -I$(srcdir)/../../xml/content/src \ -I$(srcdir)/../../xml/document/src \ - -I$(srcdir)/../../base/public \ $(NULL) diff --git a/mozilla/layout/xbl/src/makefile.win b/mozilla/layout/xbl/src/makefile.win index 23f1f164600..25c495384bb 100644 --- a/mozilla/layout/xbl/src/makefile.win +++ b/mozilla/layout/xbl/src/makefile.win @@ -76,15 +76,11 @@ EXPORTS = \ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ -I..\..\html\style\src -I..\..\html\base\src -I$(PUBLIC)\dom \ -I..\..\html\document\src \ - -I..\..\html\content\src \ - -I..\..\html\table\src \ - -I..\..\html\forms\src \ -I$(PUBLIC)\netlib \ -I$(PUBLIC)\pref \ - -I..\..\xml\content\src \ -I..\..\xml\document\src \ -I..\..\base\src \ - -I..\public + $(NULL) LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/layout/xml/content/src/Makefile.in b/mozilla/layout/xml/content/src/Makefile.in index 11a4715ee3b..a3b29a4d238 100644 --- a/mozilla/layout/xml/content/src/Makefile.in +++ b/mozilla/layout/xml/content/src/Makefile.in @@ -49,9 +49,6 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_HTML INCLUDES += \ - -I$(srcdir)/../../../html/base/src \ - -I$(srcdir)/../../../html/document/src \ - -I$(srcdir)/../../../html/style/src \ -I$(srcdir)/../../../base/src \ $(NULL) diff --git a/mozilla/layout/xml/content/src/makefile.win b/mozilla/layout/xml/content/src/makefile.win index 24b67d769f6..ff3849f87da 100644 --- a/mozilla/layout/xml/content/src/makefile.win +++ b/mozilla/layout/xml/content/src/makefile.win @@ -46,12 +46,10 @@ CPP_OBJS= \ .\$(OBJDIR)\nsXMLNamedNodeMap.obj \ $(NULL) -EXPORTS = \ +LINCS= \ + -I..\..\..\base\src \ $(NULL) -LINCS= -I..\..\..\html\style\src -I..\..\..\html\base\src \ - -I..\..\..\html\document\src -I..\..\..\base\src - LCFLAGS = \ $(LCFLAGS) \ $(DEFINES) \ diff --git a/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp b/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp index 4ac16673bcf..ae1835a77cf 100644 --- a/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp +++ b/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp @@ -26,7 +26,6 @@ #include "nsIContent.h" #include "nsITextContent.h" #include "nsGenericDOMDataNode.h" -#include "nsFrame.h" #include "nsIDocument.h" #include "nsCRT.h" #include "nsLayoutAtoms.h" diff --git a/mozilla/layout/xml/content/src/nsXMLElement.cpp b/mozilla/layout/xml/content/src/nsXMLElement.cpp index 4bc62dee03a..929688c119d 100644 --- a/mozilla/layout/xml/content/src/nsXMLElement.cpp +++ b/mozilla/layout/xml/content/src/nsXMLElement.cpp @@ -28,7 +28,7 @@ #include "nsIDOMScriptObjectFactory.h" #include "nsIWebShell.h" #include "nsIEventStateManager.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsINameSpace.h" #include "nsINameSpaceManager.h" #include "nsINodeInfo.h" diff --git a/mozilla/layout/xml/document/src/Makefile.in b/mozilla/layout/xml/document/src/Makefile.in index 0f06066d8a8..1f248cc8266 100644 --- a/mozilla/layout/xml/document/src/Makefile.in +++ b/mozilla/layout/xml/document/src/Makefile.in @@ -48,8 +48,6 @@ INCLUDES += \ -I$(srcdir)/../../../xsl/document/src \ -I$(srcdir)/../../../html/base/src \ -I$(srcdir)/../../../html/document/src \ - -I$(srcdir)/../../../html/content/src \ - -I$(srcdir)/../../../html/style/src \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../../xul/content/src \ $(NULL) diff --git a/mozilla/layout/xml/document/src/makefile.win b/mozilla/layout/xml/document/src/makefile.win index c80497632e3..3640928306c 100644 --- a/mozilla/layout/xml/document/src/makefile.win +++ b/mozilla/layout/xml/document/src/makefile.win @@ -40,8 +40,8 @@ EXPORTS = \ $(NULL) LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ - -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \ - -I..\..\..\html\content\src -I..\..\..\html\document\src \ + -I..\..\..\html\base\src -I$(PUBLIC)\dom \ + -I..\..\..\html\document\src \ -I..\..\..\xul\content\src -I..\..\..\xsl\document\src \ -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \ -I$(PUBLIC)\expat diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index 98c79bf3a9d..047fe630bd9 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -106,7 +106,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../../html/base/src \ -I$(srcdir)/../../../html/forms/src \ -I$(srcdir)/../../content/src \ - -I$(srcdir)/../../../html/content/src \ -I$(srcdir)/../../../xml/content/src \ -I$(srcdir)/../../../base/public \ $(NULL) diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win index ac9c38b4ab2..37450bf56ec 100644 --- a/mozilla/layout/xul/base/src/makefile.win +++ b/mozilla/layout/xul/base/src/makefile.win @@ -149,8 +149,6 @@ EXPORTS = \ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \ - -I..\..\..\html\document\src \ - -I..\..\..\html\content\src \ -I..\..\content\src \ -I..\..\..\html\forms\src \ -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \ diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index c7cc3cc4806..310937ae578 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -65,7 +65,6 @@ #include "nsIViewManager.h" #include "nsIView.h" #include "nsIPresShell.h" -#include "nsGenericHTMLElement.h" #include "nsFrameNavigator.h" #include "nsCSSRendering.h" #include "nsISelfScrollingFrame.h" diff --git a/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp b/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp index 75f1b902d33..b0bb481d2d7 100644 --- a/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp +++ b/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp @@ -44,7 +44,6 @@ #include "nsIViewManager.h" #include "nsIView.h" #include "nsIPresShell.h" -#include "nsGenericHTMLElement.h" #include "nsFrameNavigator.h" #include "nsCSSRendering.h" #include "nsISelfScrollingFrame.h" diff --git a/mozilla/layout/xul/base/src/nsContainerBox.cpp b/mozilla/layout/xul/base/src/nsContainerBox.cpp index e967d439765..db283f2c69d 100644 --- a/mozilla/layout/xul/base/src/nsContainerBox.cpp +++ b/mozilla/layout/xul/base/src/nsContainerBox.cpp @@ -58,7 +58,6 @@ #include "nsIViewManager.h" #include "nsIView.h" #include "nsIPresShell.h" -#include "nsGenericHTMLElement.h" #include "nsFrameNavigator.h" #include "nsCSSRendering.h" #include "nsISelfScrollingFrame.h" diff --git a/mozilla/layout/xul/base/src/nsGrippyFrame.cpp b/mozilla/layout/xul/base/src/nsGrippyFrame.cpp index 62f7a65e85e..8985901e3d8 100644 --- a/mozilla/layout/xul/base/src/nsGrippyFrame.cpp +++ b/mozilla/layout/xul/base/src/nsGrippyFrame.cpp @@ -42,7 +42,7 @@ //#include "nsSliderFrame.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsHTMLParts.h" #include "nsIPresShell.h" #include "nsIView.h" diff --git a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp index be7588085fc..28ee2d61818 100644 --- a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp @@ -34,7 +34,7 @@ #include "nsPageFrame.h" #include "nsIRenderingContext.h" #include "nsGUIEvent.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" #include "nsStyleConsts.h" #include "nsIViewManager.h" #include "nsHTMLAtoms.h" diff --git a/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp b/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp index 3c7796c74b5..401bd412ee5 100644 --- a/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp @@ -41,7 +41,6 @@ #include "nsIDOMElement.h" #include "nsXMLElement.h" #include "nsIStyledContent.h" -#include "nsGenericElement.h" #include "nsIStyleRule.h" #include "nsHTMLValue.h" #include "nsIAnonymousContent.h" diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index c686ce4f809..2212ec275d5 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -50,7 +50,7 @@ #include "nsIDOMEventReceiver.h" #include "nsIViewManager.h" #include "nsIDOMMouseEvent.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsScrollbarButtonFrame.h" #include "nsIScrollbarListener.h" #include "nsIScrollbarMediator.h" diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 9c083c90db5..cdfe3b3ee8e 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -36,11 +36,12 @@ #include "nsIDOMDocument.h" #include "nsIXMLContent.h" #include "nsIPresContext.h" -#include "nsDocument.h" +#include "nsIDocument.h" #include "nsINameSpaceManager.h" #include "nsScrollbarButtonFrame.h" #include "nsIDOMMouseListener.h" #include "nsIDOMMouseMotionListener.h" +#include "nsIDOMEventReceiver.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsIScrollableView.h" diff --git a/mozilla/layout/xul/content/src/Makefile.in b/mozilla/layout/xul/content/src/Makefile.in index a689333af3c..4dbbf48f7d2 100644 --- a/mozilla/layout/xul/content/src/Makefile.in +++ b/mozilla/layout/xul/content/src/Makefile.in @@ -40,5 +40,6 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_HTML -INCLUDES += -I$(srcdir)/../../../base/src +INCLUDES += \ + $(NULL) diff --git a/mozilla/layout/xul/content/src/makefile.win b/mozilla/layout/xul/content/src/makefile.win index d7aab30db1e..2b32d18e7ba 100644 --- a/mozilla/layout/xul/content/src/makefile.win +++ b/mozilla/layout/xul/content/src/makefile.win @@ -38,9 +38,7 @@ EXPORTS = \ $(NULL) LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \ - -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \ - -I..\..\..\html\document\src \ - -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref + -I$(PUBLIC)\dom -I$(PUBLIC)\netlib -I$(PUBLIC)\pref LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp index b4986bfe9f9..e21ddd5357e 100644 --- a/mozilla/rdf/content/src/nsXULElement.cpp +++ b/mozilla/rdf/content/src/nsXULElement.cpp @@ -52,7 +52,8 @@ #include "nsCOMPtr.h" #include "nsDOMCID.h" #include "nsDOMError.h" -#include "nsDOMEvent.h" +#include "nsIDOMEvent.h" +#include "nsIPrivateDOMEvent.h" #include "nsForwardReference.h" #include "nsHTMLValue.h" #include "nsHashtable.h"