Clean up header includes (bug 331050). This round of changes deals with some of the public content headers, and factors nsDOMClassInfoID out of nsIDOMClassInfo.h so that nsContentUtils.h doesn't have to bring in XPConnect. r+sr=jst.

accessible/src/atk/nsAccessibleText.cpp

@@ -64,6 +64,7 @@
 #include "nsStyleStruct.h"
 #include "nsTextFragment.h"
 #include "nsArray.h"
+#include "nsIComponentManager.h"
 
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
 

accessible/src/base/nsDocAccessible.h

@@ -51,6 +51,7 @@
 #include "nsIScrollPositionListener.h"
 #include "nsITimer.h"
 #include "nsIWeakReference.h"
+#include "nsCOMArray.h"
 
 class nsIScrollableView;
 

accessible/src/msaa/nsTextAccessibleWrap.cpp

@@ -50,6 +50,7 @@
 #include "nsISelection.h"
 #include "nsISelectionController.h"
 #include "nsIWidget.h"
+#include "nsIComponentManager.h"
 
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
 

content/base/public/mozISanitizingSerializer.h

@@ -99,7 +99,8 @@
 #define _mozISanitizingSerializer_h__
 
 #include "nsISupports.h"
-#include "nsAString.h"
+
+class nsAString;
 
 #define MOZ_SANITIZINGHTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/htmlsanitizer;1"
 

content/base/public/nsContentCID.h

@@ -38,10 +38,6 @@
 #ifndef nsContentCID_h__
 #define nsContentCID_h__
 
-#include "nsISupports.h"
-#include "nsIFactory.h"
-#include "nsIComponentManager.h"
-
 #define NS_DOC_ENCODER_CONTRACTID_BASE \
 "@mozilla.org/layout/documentEncoder;1?type="
 

content/base/public/nsContentPolicyUtils.h

@@ -47,9 +47,7 @@
 // for PR_LOGGING
 #include "prlog.h"
 
-#include "nsString.h"
 #include "nsIContentPolicy.h"
-#include "nsIMemory.h"
 #include "nsIServiceManager.h"
 #include "nsIContent.h"
 
@@ -57,6 +55,8 @@
 #include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
 
+class nsACString;
+
 #define NS_CONTENTPOLICY_CONTRACTID   "@mozilla.org/layout/content-policy;1"
 #define NS_CONTENTPOLICY_CATEGORY "content-policy"
 #define NS_CONTENTPOLICY_CID                              \

content/base/public/nsContentUtils.h

@@ -44,17 +44,15 @@
 
 #include "jspubtd.h"
 #include "nsAString.h"
-#include "nsIDOMScriptObjectFactory.h"
-#include "nsIJSContextStack.h"
-#include "nsIScriptContext.h"
-#include "nsCOMArray.h"
 #include "nsIStatefulFrame.h"
 #include "nsIPref.h"
 #include "nsINodeInfo.h"
 #include "nsNodeInfoManager.h"
 #include "nsContentList.h"
-#include "nsVoidArray.h"
+#include "nsDOMClassInfoID.h"
+#include "nsIClassInfo.h"
 
+class nsIDOMScriptObjectFactory;
 class nsIXPConnect;
 class nsIContent;
 class nsIDOMNode;
@@ -62,6 +60,7 @@ class nsIDocument;
 class nsIDocShell;
 class nsINameSpaceManager;
 class nsIScriptSecurityManager;
+class nsIJSContextStack;
 class nsIThreadJSContextStack;
 class nsIParserService;
 class nsIIOService;
@@ -83,6 +82,10 @@ class nsIWordBreaker;
 class nsIEventQueueService;
 class nsIJSRuntimeService;
 class nsIEventListenerManager;
+class nsIScriptContext;
+template<class E> class nsCOMArray;
+class nsIPref;
+class nsVoidArray;
 struct JSRuntime;
 #ifdef MOZ_XTF
 class nsIXTFService;
@@ -840,18 +843,8 @@ private:
 class nsCxPusher
 {
 public:
-  nsCxPusher(nsISupports *aCurrentTarget)
-    : mScriptIsRunning(PR_FALSE)
-  {
-    if (aCurrentTarget) {
-      Push(aCurrentTarget);
-    }
-  }
-
-  ~nsCxPusher()
-  {
-    Pop();
-  }
+  nsCxPusher(nsISupports *aCurrentTarget);
+  ~nsCxPusher();
 
   void Push(nsISupports *aCurrentTarget);
   void Pop();

content/base/public/nsCopySupport.h

@@ -39,14 +39,15 @@
 #define nsCopySupport_h__
 
 #include "nscore.h"
-#include "nsCOMPtr.h"
 
 class nsISelection;
 class nsIDocument;
 class nsIImageLoadingContent;
 class nsIContent;
 class nsITransferable;
- 
+class nsACString;
+class nsAString;
+
 class nsCopySupport
 {
   // class of static helper functions for copy support

content/base/public/nsIAttribute.h

@@ -40,14 +40,10 @@
 #ifndef nsIAttribute_h___
 #define nsIAttribute_h___
 
-#include "nsISupports.h"
-#include "nsINodeInfo.h"
-#include "nsIContent.h"
 #include "nsINode.h"
-#include "nsIDOMGCParticipant.h"
 
-class nsIAtom;
 class nsDOMAttributeMap;
+class nsIContent;
 
 #define NS_IATTRIBUTE_IID  \
 { 0xba2a0ee1, 0x2484, 0x49d7, \

content/base/public/nsIContent.h

@@ -37,12 +37,8 @@
 #ifndef nsIContent_h___
 #define nsIContent_h___
 
-#include <stdio.h>
-#include "nsCOMPtr.h"
-#include "nsISupports.h"
-#include "nsEvent.h"
+#include "nsCOMPtr.h" // for already_AddRefed
 #include "nsStringGlue.h"
-#include "nsContentErrors.h"
 #include "nsCaseTreatment.h"
 #include "nsChangeHint.h"
 #include "nsINode.h"

content/base/public/nsIContentSerializer.h

@@ -39,8 +39,6 @@
 #define _nsIContentSerializer_h__
 
 #include "nsISupports.h"
-#include "nsAString.h"
-#include "nsIAtom.h"
 
 class nsIDOMText; /* forward declaration */
 class nsIDOMCDATASection; /* forward declaration */
@@ -49,6 +47,7 @@ class nsIDOMComment; /* forward declaration */
 class nsIDOMDocumentType; /* forward declaration */
 class nsIDOMElement; /* forward declaration */
 class nsIDOMDocument; /* forward declaration */
+class nsAString;
 
 /* starting interface:    nsIContentSerializer */
 

content/base/public/nsIDOMGCParticipant.h

@@ -38,9 +38,9 @@
 #ifndef nsIDOMGCParticipant_h_
 #define nsIDOMGCParticipant_h_
 
-#include "nscore.h"
 #include "nsISupports.h"
-#include "nsCOMArray.h"
+
+template<class E> class nsCOMArray;
 
 // 0e2a5a8d-28fd-4a5c-8bf1-5b0067ff3286
 #define NS_IDOMGCPARTICIPANT_IID \

content/base/public/nsIDocument.h

@@ -38,10 +38,8 @@
 #define nsIDocument_h___
 
 #include "nsINode.h"
-#include "nsEvent.h"
 #include "nsStringGlue.h"
-#include "nsCOMArray.h"
-#include "nsIDocumentObserver.h"
+#include "nsIDocumentObserver.h" // for nsUpdateType
 #include "nsCOMPtr.h"
 #include "nsIURI.h"
 #include "nsIBindingManager.h"
@@ -50,7 +48,6 @@
 #include "nsILoadGroup.h"
 #include "nsCRT.h"
 #include "mozFlushType.h"
-#include "nsAutoPtr.h"
 #include "nsIAtom.h"
 
 class nsIContent;
@@ -89,6 +86,8 @@ class nsIHTMLCSSStyleSheet;
 class nsILayoutHistoryState;
 class nsIVariant;
 class nsIDOMUserDataHandler;
+template<class E> class nsCOMArray;
+class nsIDocumentObserver;
 
 // IID for the nsIDocument interface
 #define NS_IDOCUMENT_IID      \

content/base/src/nsAttrValue.h

@@ -43,7 +43,6 @@
 #include "nsString.h"
 #include "nsStringBuffer.h"
 #include "nsColor.h"
-#include "nsCOMArray.h"
 #include "nsCaseTreatment.h"
 
 typedef unsigned long PtrBits;
@@ -52,6 +51,8 @@ class nsIAtom;
 class nsICSSStyleRule;
 class nsISVGValue;
 class nsIDocument;
+template<class E> class nsCOMArray;
+class nsVoidArray;
 
 #define NS_ATTRVALUE_MAX_STRINGLENGTH_ATOM 12
 

content/base/src/nsContentUtils.cpp

@@ -2246,6 +2246,19 @@ nsContentUtils::GetEventArgName(PRInt32 aNameSpaceID)
   return gEventName;
 }
 
+nsCxPusher::nsCxPusher(nsISupports *aCurrentTarget)
+    : mScriptIsRunning(PR_FALSE)
+{
+  if (aCurrentTarget) {
+    Push(aCurrentTarget);
+  }
+}
+
+nsCxPusher::~nsCxPusher()
+{
+  Pop();
+}
+
 void
 nsCxPusher::Push(nsISupports *aCurrentTarget)
 {

content/base/src/nsDocument.cpp

@@ -138,6 +138,8 @@ static NS_DEFINE_CID(kDOMEventGroupCID, NS_DOMEVENTGROUP_CID);
 #include "nsDateTimeFormatCID.h"
 #include "nsIDateTimeFormat.h"
 #include "nsEventDispatcher.h"
+#include "nsIDOMXPathEvaluator.h"
+#include "nsDOMCID.h"
 
 #ifdef MOZ_LOGGING
 // so we can get logging even in release builds

content/base/src/nsGenericDOMDataNode.cpp

@@ -57,6 +57,7 @@
 #include "nsIDOMUserDataHandler.h"
 #include "nsChangeHint.h"
 #include "nsEventDispatcher.h"
+#include "nsCOMArray.h"
 
 #include "pldhash.h"
 #include "prprf.h"

content/base/src/nsNodeInfoManager.h

@@ -38,8 +38,7 @@
 #ifndef nsNodeInfoManager_h___
 #define nsNodeInfoManager_h___
 
-#include "nsCOMArray.h"
-#include "nsCOMPtr.h"
+#include "nsCOMPtr.h" // for already_AddRefed
 #include "plhash.h"
 
 class nsIAtom;

content/base/src/nsScriptLoader.cpp

@@ -60,6 +60,8 @@
 #include "nsContentUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsAutoPtr.h"
+#include "nsIXPConnect.h"
+#include "nsContentErrors.h"
 
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 

content/base/src/nsTreeWalker.cpp

@@ -53,6 +53,7 @@
 
 #include "nsContentUtils.h"
 #include "nsMemory.h"
+#include "nsCOMArray.h"
 
 /*
  * Factories, constructors and destructors

content/base/src/nsXMLContentSerializer.h

@@ -44,6 +44,7 @@
 #include "nsVoidArray.h"
 
 class nsIDOMNode;
+class nsIAtom;
 
 class nsXMLContentSerializer : public nsIContentSerializer {
  public:

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -76,6 +76,8 @@
 #include "nsIPresShell.h"
 #include "nsIDOMWindow.h"
 #include "nsPIDOMWindow.h"
+#include "nsIXPConnect.h"
+#include "jsapi.h"
 
 #include "cairo.h"
 #include "imgIEncoder.h"

content/events/src/nsEventListenerManager.h

@@ -49,6 +49,7 @@
 
 class nsIDOMEvent;
 class nsIAtom;
+class nsVoidArray;
 
 typedef struct {
   // The nsMarkedJSFunctionHolder does magic to avoid holding strong

content/html/content/src/nsHTMLScriptElement.cpp

@@ -59,6 +59,7 @@
 #include "nsIScriptEventHandler.h"
 #include "nsIDOMDocument.h"
 #include "nsEventDispatcher.h"
+#include "nsContentErrors.h"
 
 
 //

content/html/document/src/nsImageDocument.cpp

@@ -66,6 +66,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMNSHTMLElement.h"
+#include "nsContentErrors.h"
 
 #define AUTOMATIC_IMAGE_RESIZING_PREF "browser.enable_automatic_image_resizing"
 

content/svg/content/src/nsSVGStylableElement.cpp

@@ -41,6 +41,7 @@
 #include "nsSVGAnimatedString.h"
 #include "nsSVGAtoms.h"
 #include "nsDOMCSSDeclaration.h"
+#include "nsIDOMClassInfo.h"
 
 static NS_DEFINE_CID(kCSSOMFactoryCID, NS_CSSOMFACTORY_CID);
 

content/svg/content/src/nsSVGTransformList.cpp

@@ -47,6 +47,7 @@
 #include "nsCRT.h"
 #include "nsCOMArray.h"
 #include "nsContentUtils.h"
+#include "nsIDOMClassInfo.h"
 
 nsresult
 nsSVGTransformList::Create(nsIDOMSVGTransformList** aResult)

content/xbl/src/nsXBLProtoImplMethod.cpp

@@ -49,6 +49,7 @@
 #include "nsIScriptContext.h"
 #include "nsContentUtils.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsIXPConnect.h"
 
 MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplMethod)
 

content/xml/content/src/nsXMLElement.cpp

@@ -68,6 +68,7 @@
 #include "nsIBindingManager.h"
 #include "nsLayoutAtoms.h"
 #include "nsEventDispatcher.h"
+#include "nsContentErrors.h"
 
 nsresult
 NS_NewXMLElement(nsIContent** aInstancePtrResult, nsINodeInfo *aNodeInfo)
@@ -384,4 +385,3 @@ nsXMLElement::IsFocusable(PRInt32 *aTabIndex)
 
 
 NS_IMPL_DOM_CLONENODE(nsXMLElement)
-

content/xml/document/src/nsXMLContentSink.cpp

@@ -95,6 +95,7 @@
 #include "nsContentCreatorFunctions.h"
 #include "nsIContentPolicy.h"
 #include "nsContentPolicyUtils.h"
+#include "nsContentErrors.h"
 
 #ifdef MOZ_SVG
 #include "nsSVGAtoms.h"

content/xslt/src/xpath/nsXPath1Scheme.cpp

@@ -55,6 +55,7 @@
 #include "nsIModifyableXPointer.h"
 #include "nsAutoPtr.h"
 #include "nsString.h"
+#include "nsIComponentManager.h"
 
 #include "nsContentCID.h"
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);

content/xtf/src/nsXTFElementWrapper.cpp

@@ -55,6 +55,8 @@
 #include "nsUnicharUtils.h"
 #include "nsLayoutAtoms.h"
 #include "nsEventDispatcher.h"
+#include "nsIProgrammingLanguage.h"
+#include "nsIXPConnect.h"
 
 nsXTFElementWrapper::nsXTFElementWrapper(nsINodeInfo* aNodeInfo)
     : nsXTFElementWrapperBase(aNodeInfo),

content/xul/document/src/nsXULDocument.cpp

@@ -118,6 +118,7 @@
 #include "nsICSSStyleSheet.h"
 #include "nsIScriptError.h"
 #include "nsEventDispatcher.h"
+#include "nsContentErrors.h"
 
 //----------------------------------------------------------------------
 //

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -94,6 +94,7 @@
 #include "rdf.h"
 #include "pldhash.h"
 #include "plhash.h"
+#include "nsIDOMClassInfo.h"
 
 #include "nsNetUtil.h"
 #include "nsXULTemplateBuilder.h"

docshell/base/nsDocShell.cpp

@@ -183,6 +183,7 @@ static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
 #include "plevent.h"
 #include "nsGUIEvent.h"
 #include "nsEventQueueUtils.h"
+#include "nsContentErrors.h"
 
 // Number of documents currently loading
 static PRInt32 gNumberOfDocumentsLoading = 0;

dom/public/Makefile.in

@@ -64,9 +64,9 @@ EXPORTS=nsIScriptContext.h		\
 	nsDOMError.h			\
 	nsIJSEventListener.h		\
 	nsIDOMClassInfo.h		\
+	nsDOMClassInfoID.h		\
 	nsIBaseDOMException.h		\
 	nsDOMString.h			\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-

dom/public/nsDOMClassInfoID.h

@@ -0,0 +1,385 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Johnny Stenback <jst@netscape.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * This file defines enum values for all of the DOM objects which have
+ * an entry in nsDOMClassInfo.
+ */
+
+#ifndef nsDOMClassInfoID_h__
+#define nsDOMClassInfoID_h__
+
+enum nsDOMClassInfoID {
+  // Base classes
+  eDOMClassInfo_Window_id,
+  eDOMClassInfo_Location_id,
+  eDOMClassInfo_Navigator_id,
+  eDOMClassInfo_Plugin_id,
+  eDOMClassInfo_PluginArray_id,
+  eDOMClassInfo_MimeType_id,
+  eDOMClassInfo_MimeTypeArray_id,
+  eDOMClassInfo_BarProp_id,
+  eDOMClassInfo_History_id,
+  eDOMClassInfo_Screen_id,
+  eDOMClassInfo_Constructor_id,
+
+  // Core classes
+  eDOMClassInfo_XMLDocument_id,
+  eDOMClassInfo_DocumentType_id,
+  eDOMClassInfo_DOMImplementation_id,
+  eDOMClassInfo_DOMException_id,
+  eDOMClassInfo_DocumentFragment_id,
+  eDOMClassInfo_Element_id,
+  eDOMClassInfo_Attr_id,
+  eDOMClassInfo_Text_id,
+  eDOMClassInfo_Comment_id,
+  eDOMClassInfo_CDATASection_id,
+  eDOMClassInfo_ProcessingInstruction_id,
+  eDOMClassInfo_Entity_id,
+  eDOMClassInfo_EntityReference_id,
+  eDOMClassInfo_Notation_id,
+  eDOMClassInfo_NodeList_id,
+  eDOMClassInfo_NamedNodeMap_id,
+
+  // StyleSheet classes
+  eDOMClassInfo_DocumentStyleSheetList_id,
+
+  // Event classes
+  eDOMClassInfo_Event_id,
+  eDOMClassInfo_MutationEvent_id,
+  eDOMClassInfo_UIEvent_id,
+  eDOMClassInfo_MouseEvent_id,
+  eDOMClassInfo_KeyboardEvent_id,
+  eDOMClassInfo_PopupBlockedEvent_id,
+
+  // HTML classes
+  eDOMClassInfo_HTMLDocument_id,
+  eDOMClassInfo_HTMLCollection_id,
+  eDOMClassInfo_HTMLOptionsCollection_id,
+  eDOMClassInfo_HTMLFormControlCollection_id,
+  eDOMClassInfo_HTMLGenericCollection_id,
+
+  // HTML element classes
+  eDOMClassInfo_HTMLAnchorElement_id,
+  eDOMClassInfo_HTMLAppletElement_id,
+  eDOMClassInfo_HTMLAreaElement_id,
+  eDOMClassInfo_HTMLBRElement_id,
+  eDOMClassInfo_HTMLBaseElement_id,
+  eDOMClassInfo_HTMLBaseFontElement_id,
+  eDOMClassInfo_HTMLBodyElement_id,
+  eDOMClassInfo_HTMLButtonElement_id,
+  eDOMClassInfo_HTMLDListElement_id,
+  eDOMClassInfo_HTMLDelElement_id,
+  eDOMClassInfo_HTMLDirectoryElement_id,
+  eDOMClassInfo_HTMLDivElement_id,
+  eDOMClassInfo_HTMLEmbedElement_id,
+  eDOMClassInfo_HTMLFieldSetElement_id,
+  eDOMClassInfo_HTMLFontElement_id,
+  eDOMClassInfo_HTMLFormElement_id,
+  eDOMClassInfo_HTMLFrameElement_id,
+  eDOMClassInfo_HTMLFrameSetElement_id,
+  eDOMClassInfo_HTMLHRElement_id,
+  eDOMClassInfo_HTMLHeadElement_id,
+  eDOMClassInfo_HTMLHeadingElement_id,
+  eDOMClassInfo_HTMLHtmlElement_id,
+  eDOMClassInfo_HTMLIFrameElement_id,
+  eDOMClassInfo_HTMLImageElement_id,
+  eDOMClassInfo_HTMLInputElement_id,
+  eDOMClassInfo_HTMLInsElement_id,
+  eDOMClassInfo_HTMLIsIndexElement_id,
+  eDOMClassInfo_HTMLLIElement_id,
+  eDOMClassInfo_HTMLLabelElement_id,
+  eDOMClassInfo_HTMLLegendElement_id,
+  eDOMClassInfo_HTMLLinkElement_id,
+  eDOMClassInfo_HTMLMapElement_id,
+  eDOMClassInfo_HTMLMenuElement_id,
+  eDOMClassInfo_HTMLMetaElement_id,
+  eDOMClassInfo_HTMLModElement_id,
+  eDOMClassInfo_HTMLOListElement_id,
+  eDOMClassInfo_HTMLObjectElement_id,
+  eDOMClassInfo_HTMLOptGroupElement_id,
+  eDOMClassInfo_HTMLOptionElement_id,
+  eDOMClassInfo_HTMLParagraphElement_id,
+  eDOMClassInfo_HTMLParamElement_id,
+  eDOMClassInfo_HTMLPreElement_id,
+  eDOMClassInfo_HTMLQuoteElement_id,
+  eDOMClassInfo_HTMLScriptElement_id,
+  eDOMClassInfo_HTMLSelectElement_id,
+  eDOMClassInfo_HTMLSpacerElement_id,
+  eDOMClassInfo_HTMLSpanElement_id,
+  eDOMClassInfo_HTMLStyleElement_id,
+  eDOMClassInfo_HTMLTableCaptionElement_id,
+  eDOMClassInfo_HTMLTableCellElement_id,
+  eDOMClassInfo_HTMLTableColElement_id,
+  eDOMClassInfo_HTMLTableColGroupElement_id,
+  eDOMClassInfo_HTMLTableElement_id,
+  eDOMClassInfo_HTMLTableRowElement_id,
+  eDOMClassInfo_HTMLTableSectionElement_id,
+  eDOMClassInfo_HTMLTextAreaElement_id,
+  eDOMClassInfo_HTMLTitleElement_id,
+  eDOMClassInfo_HTMLUListElement_id,
+  eDOMClassInfo_HTMLUnknownElement_id,
+  eDOMClassInfo_HTMLWBRElement_id,
+
+  // CSS classes
+  eDOMClassInfo_CSSStyleRule_id,
+  eDOMClassInfo_CSSCharsetRule_id,
+  eDOMClassInfo_CSSImportRule_id,
+  eDOMClassInfo_CSSMediaRule_id,
+  eDOMClassInfo_CSSNameSpaceRule_id,
+  eDOMClassInfo_CSSRuleList_id,
+  eDOMClassInfo_CSSGroupRuleRuleList_id,
+  eDOMClassInfo_MediaList_id,
+  eDOMClassInfo_StyleSheetList_id,
+  eDOMClassInfo_CSSStyleSheet_id,
+  eDOMClassInfo_CSSStyleDeclaration_id,
+  eDOMClassInfo_ComputedCSSStyleDeclaration_id,
+  eDOMClassInfo_ROCSSPrimitiveValue_id,
+
+  // Range classes
+  eDOMClassInfo_Range_id,
+  eDOMClassInfo_Selection_id,
+
+  // XUL classes
+#ifdef MOZ_XUL
+  eDOMClassInfo_XULDocument_id,
+  eDOMClassInfo_XULElement_id,
+  eDOMClassInfo_XULCommandDispatcher_id,
+  eDOMClassInfo_XULNodeList_id,
+  eDOMClassInfo_XULNamedNodeMap_id,
+  eDOMClassInfo_XULAttr_id,
+#endif
+  eDOMClassInfo_XULControllers_id,
+#ifdef MOZ_XUL
+  eDOMClassInfo_BoxObject_id,
+  eDOMClassInfo_TreeSelection_id,
+  eDOMClassInfo_TreeContentView_id,
+#endif
+
+  // Crypto classes
+  eDOMClassInfo_Crypto_id,
+  eDOMClassInfo_CRMFObject_id,
+  eDOMClassInfo_Pkcs11_id,
+  
+  // DOM Traversal classes
+  eDOMClassInfo_TreeWalker_id,
+
+  // Rect object used by getComputedStyle
+  eDOMClassInfo_CSSRect_id,
+
+  // DOM Chrome Window class, almost identical to Window
+  eDOMClassInfo_ChromeWindow_id,
+
+  // RGBColor object used by getComputedStyle
+  eDOMClassInfo_CSSRGBColor_id,
+
+  eDOMClassInfo_RangeException_id,
+
+  // CSSValueList object that represents an nsIDOMCSSValueList, used
+  // by DOM CSS
+  eDOMClassInfo_CSSValueList_id,
+
+  // ContentList object used for various live NodeLists
+  eDOMClassInfo_ContentList_id,
+  
+  // Processing-instruction with target "xml-stylesheet"
+  eDOMClassInfo_XMLStylesheetProcessingInstruction_id,
+  
+  eDOMClassInfo_ImageDocument_id,
+
+#ifdef MOZ_XUL
+  eDOMClassInfo_XULTemplateBuilder_id,
+  eDOMClassInfo_XULTreeBuilder_id,
+#endif
+
+  // DOMStringList object
+  eDOMClassInfo_DOMStringList_id,
+
+  // NameList object used by the DOM
+  eDOMClassInfo_NameList_id,
+
+#ifdef MOZ_XUL
+  eDOMClassInfo_TreeColumn_id,
+  eDOMClassInfo_TreeColumns_id,
+#endif
+
+  eDOMClassInfo_CSSMozDocumentRule_id,
+
+  eDOMClassInfo_BeforeUnloadEvent_id,
+
+#ifdef MOZ_SVG
+  // The SVG document
+  eDOMClassInfo_SVGDocument_id,
+
+  // SVG element classes
+  eDOMClassInfo_SVGCircleElement_id,
+  eDOMClassInfo_SVGClipPathElement_id,
+  eDOMClassInfo_SVGDefsElement_id,
+  eDOMClassInfo_SVGDescElement_id,
+  eDOMClassInfo_SVGEllipseElement_id,
+  eDOMClassInfo_SVGFEComponentTransferElement_id,
+  eDOMClassInfo_SVGFEFuncAElement_id,
+  eDOMClassInfo_SVGFEFuncBElement_id,
+  eDOMClassInfo_SVGFEFuncGElement_id,
+  eDOMClassInfo_SVGFEFuncRElement_id,
+  eDOMClassInfo_SVGFEGaussianBlurElement_id,
+  eDOMClassInfo_SVGFEMergeElement_id,
+  eDOMClassInfo_SVGFEMergeNodeElement_id,
+  eDOMClassInfo_SVGFEOffsetElement_id,
+  eDOMClassInfo_SVGFEUnimplementedMOZElement_id,
+  eDOMClassInfo_SVGFilterElement_id,
+  eDOMClassInfo_SVGGElement_id,
+  eDOMClassInfo_SVGGradientElement_id,
+  eDOMClassInfo_SVGImageElement_id,
+  eDOMClassInfo_SVGLinearGradientElement_id,
+  eDOMClassInfo_SVGLineElement_id,
+  eDOMClassInfo_SVGMarkerElement_id,
+  eDOMClassInfo_SVGMaskElement_id,
+  eDOMClassInfo_SVGMetadataElement_id,
+  eDOMClassInfo_SVGPathElement_id,
+  eDOMClassInfo_SVGPatternElement_id,
+  eDOMClassInfo_SVGPolygonElement_id,
+  eDOMClassInfo_SVGPolylineElement_id,
+  eDOMClassInfo_SVGRadialGradientElement_id,
+  eDOMClassInfo_SVGRectElement_id,
+  eDOMClassInfo_SVGScriptElement_id,
+  eDOMClassInfo_SVGStopElement_id,
+  eDOMClassInfo_SVGStyleElement_id,
+  eDOMClassInfo_SVGSVGElement_id,
+  eDOMClassInfo_SVGSymbolElement_id,
+  eDOMClassInfo_SVGTextElement_id,
+  eDOMClassInfo_SVGTextPathElement_id,
+  eDOMClassInfo_SVGTitleElement_id,
+  eDOMClassInfo_SVGTSpanElement_id,
+  eDOMClassInfo_SVGUseElement_id,
+
+  // other SVG classes
+  eDOMClassInfo_SVGAngle_id,
+  eDOMClassInfo_SVGAnimatedAngle_id,
+  eDOMClassInfo_SVGAnimatedEnumeration_id,
+  eDOMClassInfo_SVGAnimatedInteger_id,
+  eDOMClassInfo_SVGAnimatedLength_id,
+  eDOMClassInfo_SVGAnimatedLengthList_id,
+  eDOMClassInfo_SVGAnimatedNumber_id,
+  eDOMClassInfo_SVGAnimatedNumberList_id,
+  eDOMClassInfo_SVGAnimatedPoints_id,
+  eDOMClassInfo_SVGAnimatedPreserveAspectRatio_id,
+  eDOMClassInfo_SVGAnimatedRect_id,
+  eDOMClassInfo_SVGAnimatedString_id,
+  eDOMClassInfo_SVGAnimatedTransformList_id,
+  eDOMClassInfo_SVGEvent_id,
+  eDOMClassInfo_SVGException_id,
+  eDOMClassInfo_SVGLength_id,
+  eDOMClassInfo_SVGLengthList_id,
+  eDOMClassInfo_SVGMatrix_id,
+  eDOMClassInfo_SVGNumber_id,
+  eDOMClassInfo_SVGNumberList_id,
+  eDOMClassInfo_SVGPathSegArcAbs_id,
+  eDOMClassInfo_SVGPathSegArcRel_id,
+  eDOMClassInfo_SVGPathSegClosePath_id,
+  eDOMClassInfo_SVGPathSegCurvetoCubicAbs_id,
+  eDOMClassInfo_SVGPathSegCurvetoCubicRel_id,
+  eDOMClassInfo_SVGPathSegCurvetoCubicSmoothAbs_id,
+  eDOMClassInfo_SVGPathSegCurvetoCubicSmoothRel_id,
+  eDOMClassInfo_SVGPathSegCurvetoQuadraticAbs_id,
+  eDOMClassInfo_SVGPathSegCurvetoQuadraticRel_id,
+  eDOMClassInfo_SVGPathSegCurvetoQuadraticSmoothAbs_id,
+  eDOMClassInfo_SVGPathSegCurvetoQuadraticSmoothRel_id,
+  eDOMClassInfo_SVGPathSegLinetoAbs_id,
+  eDOMClassInfo_SVGPathSegLinetoHorizontalAbs_id,
+  eDOMClassInfo_SVGPathSegLinetoHorizontalRel_id,
+  eDOMClassInfo_SVGPathSegLinetoRel_id,
+  eDOMClassInfo_SVGPathSegLinetoVerticalAbs_id,
+  eDOMClassInfo_SVGPathSegLinetoVerticalRel_id,
+  eDOMClassInfo_SVGPathSegList_id,
+  eDOMClassInfo_SVGPathSegMovetoAbs_id,
+  eDOMClassInfo_SVGPathSegMovetoRel_id,
+  eDOMClassInfo_SVGPoint_id,
+  eDOMClassInfo_SVGPointList_id,
+  eDOMClassInfo_SVGPreserveAspectRatio_id,
+  eDOMClassInfo_SVGRect_id,
+  eDOMClassInfo_SVGTransform_id,
+  eDOMClassInfo_SVGTransformList_id,
+  eDOMClassInfo_SVGZoomEvent_id,
+#endif // MOZ_SVG
+
+  // Canvas
+  eDOMClassInfo_HTMLCanvasElement_id,
+#ifdef MOZ_ENABLE_CANVAS
+  eDOMClassInfo_CanvasRenderingContext2D_id,
+  eDOMClassInfo_CanvasGradient_id,
+  eDOMClassInfo_CanvasPattern_id,
+#endif
+  
+  // SmartCard Events
+  eDOMClassInfo_SmartCardEvent_id,
+  
+  // PageTransition Events
+  eDOMClassInfo_PageTransitionEvent_id,
+
+  // WindowUtils
+  eDOMClassInfo_WindowUtils_id,
+
+  // XSLTProcessor
+  eDOMClassInfo_XSLTProcessor_id,
+
+  // DOM Level 3 XPath objects
+  eDOMClassInfo_XPathEvaluator_id,
+  eDOMClassInfo_XPathException_id,
+  eDOMClassInfo_XPathExpression_id,
+  eDOMClassInfo_XPathNSResolver_id,
+  eDOMClassInfo_XPathResult_id,
+
+  eDOMClassInfo_WindowRoot_id,
+
+  // We are now trying to preserve binary compat in classinfo.  No more
+  // putting things in those categories up there.  New entries are to be
+  // added here, which is the end of the things that are currently on by
+  // default.
+
+  // Define this near the end so that enabling/disabling foreignobject doesn't
+  // break binary compatibility
+#if defined(MOZ_SVG) && defined(MOZ_SVG_FOREIGNOBJECT)
+  eDOMClassInfo_SVGForeignObjectElement_id,
+#endif
+
+  // This one better be the last one in this list
+  eDOMClassInfoIDCount
+};
+
+#endif // nsDOMClassInfoID_h__

dom/public/nsIDOMClassInfo.h

@@ -41,345 +41,7 @@
 
 #include "nsIClassInfoImpl.h"
 #include "nsVoidArray.h"
-
-enum nsDOMClassInfoID {
-  // Base classes
-  eDOMClassInfo_Window_id,
-  eDOMClassInfo_Location_id,
-  eDOMClassInfo_Navigator_id,
-  eDOMClassInfo_Plugin_id,
-  eDOMClassInfo_PluginArray_id,
-  eDOMClassInfo_MimeType_id,
-  eDOMClassInfo_MimeTypeArray_id,
-  eDOMClassInfo_BarProp_id,
-  eDOMClassInfo_History_id,
-  eDOMClassInfo_Screen_id,
-  eDOMClassInfo_Constructor_id,
-
-  // Core classes
-  eDOMClassInfo_XMLDocument_id,
-  eDOMClassInfo_DocumentType_id,
-  eDOMClassInfo_DOMImplementation_id,
-  eDOMClassInfo_DOMException_id,
-  eDOMClassInfo_DocumentFragment_id,
-  eDOMClassInfo_Element_id,
-  eDOMClassInfo_Attr_id,
-  eDOMClassInfo_Text_id,
-  eDOMClassInfo_Comment_id,
-  eDOMClassInfo_CDATASection_id,
-  eDOMClassInfo_ProcessingInstruction_id,
-  eDOMClassInfo_Entity_id,
-  eDOMClassInfo_EntityReference_id,
-  eDOMClassInfo_Notation_id,
-  eDOMClassInfo_NodeList_id,
-  eDOMClassInfo_NamedNodeMap_id,
-
-  // StyleSheet classes
-  eDOMClassInfo_DocumentStyleSheetList_id,
-
-  // Event classes
-  eDOMClassInfo_Event_id,
-  eDOMClassInfo_MutationEvent_id,
-  eDOMClassInfo_UIEvent_id,
-  eDOMClassInfo_MouseEvent_id,
-  eDOMClassInfo_KeyboardEvent_id,
-  eDOMClassInfo_PopupBlockedEvent_id,
-
-  // HTML classes
-  eDOMClassInfo_HTMLDocument_id,
-  eDOMClassInfo_HTMLCollection_id,
-  eDOMClassInfo_HTMLOptionsCollection_id,
-  eDOMClassInfo_HTMLFormControlCollection_id,
-  eDOMClassInfo_HTMLGenericCollection_id,
-
-  // HTML element classes
-  eDOMClassInfo_HTMLAnchorElement_id,
-  eDOMClassInfo_HTMLAppletElement_id,
-  eDOMClassInfo_HTMLAreaElement_id,
-  eDOMClassInfo_HTMLBRElement_id,
-  eDOMClassInfo_HTMLBaseElement_id,
-  eDOMClassInfo_HTMLBaseFontElement_id,
-  eDOMClassInfo_HTMLBodyElement_id,
-  eDOMClassInfo_HTMLButtonElement_id,
-  eDOMClassInfo_HTMLDListElement_id,
-  eDOMClassInfo_HTMLDelElement_id,
-  eDOMClassInfo_HTMLDirectoryElement_id,
-  eDOMClassInfo_HTMLDivElement_id,
-  eDOMClassInfo_HTMLEmbedElement_id,
-  eDOMClassInfo_HTMLFieldSetElement_id,
-  eDOMClassInfo_HTMLFontElement_id,
-  eDOMClassInfo_HTMLFormElement_id,
-  eDOMClassInfo_HTMLFrameElement_id,
-  eDOMClassInfo_HTMLFrameSetElement_id,
-  eDOMClassInfo_HTMLHRElement_id,
-  eDOMClassInfo_HTMLHeadElement_id,
-  eDOMClassInfo_HTMLHeadingElement_id,
-  eDOMClassInfo_HTMLHtmlElement_id,
-  eDOMClassInfo_HTMLIFrameElement_id,
-  eDOMClassInfo_HTMLImageElement_id,
-  eDOMClassInfo_HTMLInputElement_id,
-  eDOMClassInfo_HTMLInsElement_id,
-  eDOMClassInfo_HTMLIsIndexElement_id,
-  eDOMClassInfo_HTMLLIElement_id,
-  eDOMClassInfo_HTMLLabelElement_id,
-  eDOMClassInfo_HTMLLegendElement_id,
-  eDOMClassInfo_HTMLLinkElement_id,
-  eDOMClassInfo_HTMLMapElement_id,
-  eDOMClassInfo_HTMLMenuElement_id,
-  eDOMClassInfo_HTMLMetaElement_id,
-  eDOMClassInfo_HTMLModElement_id,
-  eDOMClassInfo_HTMLOListElement_id,
-  eDOMClassInfo_HTMLObjectElement_id,
-  eDOMClassInfo_HTMLOptGroupElement_id,
-  eDOMClassInfo_HTMLOptionElement_id,
-  eDOMClassInfo_HTMLParagraphElement_id,
-  eDOMClassInfo_HTMLParamElement_id,
-  eDOMClassInfo_HTMLPreElement_id,
-  eDOMClassInfo_HTMLQuoteElement_id,
-  eDOMClassInfo_HTMLScriptElement_id,
-  eDOMClassInfo_HTMLSelectElement_id,
-  eDOMClassInfo_HTMLSpacerElement_id,
-  eDOMClassInfo_HTMLSpanElement_id,
-  eDOMClassInfo_HTMLStyleElement_id,
-  eDOMClassInfo_HTMLTableCaptionElement_id,
-  eDOMClassInfo_HTMLTableCellElement_id,
-  eDOMClassInfo_HTMLTableColElement_id,
-  eDOMClassInfo_HTMLTableColGroupElement_id,
-  eDOMClassInfo_HTMLTableElement_id,
-  eDOMClassInfo_HTMLTableRowElement_id,
-  eDOMClassInfo_HTMLTableSectionElement_id,
-  eDOMClassInfo_HTMLTextAreaElement_id,
-  eDOMClassInfo_HTMLTitleElement_id,
-  eDOMClassInfo_HTMLUListElement_id,
-  eDOMClassInfo_HTMLUnknownElement_id,
-  eDOMClassInfo_HTMLWBRElement_id,
-
-  // CSS classes
-  eDOMClassInfo_CSSStyleRule_id,
-  eDOMClassInfo_CSSCharsetRule_id,
-  eDOMClassInfo_CSSImportRule_id,
-  eDOMClassInfo_CSSMediaRule_id,
-  eDOMClassInfo_CSSNameSpaceRule_id,
-  eDOMClassInfo_CSSRuleList_id,
-  eDOMClassInfo_CSSGroupRuleRuleList_id,
-  eDOMClassInfo_MediaList_id,
-  eDOMClassInfo_StyleSheetList_id,
-  eDOMClassInfo_CSSStyleSheet_id,
-  eDOMClassInfo_CSSStyleDeclaration_id,
-  eDOMClassInfo_ComputedCSSStyleDeclaration_id,
-  eDOMClassInfo_ROCSSPrimitiveValue_id,
-
-  // Range classes
-  eDOMClassInfo_Range_id,
-  eDOMClassInfo_Selection_id,
-
-  // XUL classes
-#ifdef MOZ_XUL
-  eDOMClassInfo_XULDocument_id,
-  eDOMClassInfo_XULElement_id,
-  eDOMClassInfo_XULCommandDispatcher_id,
-  eDOMClassInfo_XULNodeList_id,
-  eDOMClassInfo_XULNamedNodeMap_id,
-  eDOMClassInfo_XULAttr_id,
-#endif
-  eDOMClassInfo_XULControllers_id,
-#ifdef MOZ_XUL
-  eDOMClassInfo_BoxObject_id,
-  eDOMClassInfo_TreeSelection_id,
-  eDOMClassInfo_TreeContentView_id,
-#endif
-
-  // Crypto classes
-  eDOMClassInfo_Crypto_id,
-  eDOMClassInfo_CRMFObject_id,
-  eDOMClassInfo_Pkcs11_id,
-  
-  // DOM Traversal classes
-  eDOMClassInfo_TreeWalker_id,
-
-  // Rect object used by getComputedStyle
-  eDOMClassInfo_CSSRect_id,
-
-  // DOM Chrome Window class, almost identical to Window
-  eDOMClassInfo_ChromeWindow_id,
-
-  // RGBColor object used by getComputedStyle
-  eDOMClassInfo_CSSRGBColor_id,
-
-  eDOMClassInfo_RangeException_id,
-
-  // CSSValueList object that represents an nsIDOMCSSValueList, used
-  // by DOM CSS
-  eDOMClassInfo_CSSValueList_id,
-
-  // ContentList object used for various live NodeLists
-  eDOMClassInfo_ContentList_id,
-  
-  // Processing-instruction with target "xml-stylesheet"
-  eDOMClassInfo_XMLStylesheetProcessingInstruction_id,
-  
-  eDOMClassInfo_ImageDocument_id,
-
-#ifdef MOZ_XUL
-  eDOMClassInfo_XULTemplateBuilder_id,
-  eDOMClassInfo_XULTreeBuilder_id,
-#endif
-
-  // DOMStringList object
-  eDOMClassInfo_DOMStringList_id,
-
-  // NameList object used by the DOM
-  eDOMClassInfo_NameList_id,
-
-#ifdef MOZ_XUL
-  eDOMClassInfo_TreeColumn_id,
-  eDOMClassInfo_TreeColumns_id,
-#endif
-
-  eDOMClassInfo_CSSMozDocumentRule_id,
-
-  eDOMClassInfo_BeforeUnloadEvent_id,
-
-#ifdef MOZ_SVG
-  // The SVG document
-  eDOMClassInfo_SVGDocument_id,
-
-  // SVG element classes
-  eDOMClassInfo_SVGCircleElement_id,
-  eDOMClassInfo_SVGClipPathElement_id,
-  eDOMClassInfo_SVGDefsElement_id,
-  eDOMClassInfo_SVGDescElement_id,
-  eDOMClassInfo_SVGEllipseElement_id,
-  eDOMClassInfo_SVGFEComponentTransferElement_id,
-  eDOMClassInfo_SVGFEFuncAElement_id,
-  eDOMClassInfo_SVGFEFuncBElement_id,
-  eDOMClassInfo_SVGFEFuncGElement_id,
-  eDOMClassInfo_SVGFEFuncRElement_id,
-  eDOMClassInfo_SVGFEGaussianBlurElement_id,
-  eDOMClassInfo_SVGFEMergeElement_id,
-  eDOMClassInfo_SVGFEMergeNodeElement_id,
-  eDOMClassInfo_SVGFEOffsetElement_id,
-  eDOMClassInfo_SVGFEUnimplementedMOZElement_id,
-  eDOMClassInfo_SVGFilterElement_id,
-  eDOMClassInfo_SVGGElement_id,
-  eDOMClassInfo_SVGGradientElement_id,
-  eDOMClassInfo_SVGImageElement_id,
-  eDOMClassInfo_SVGLinearGradientElement_id,
-  eDOMClassInfo_SVGLineElement_id,
-  eDOMClassInfo_SVGMarkerElement_id,
-  eDOMClassInfo_SVGMaskElement_id,
-  eDOMClassInfo_SVGMetadataElement_id,
-  eDOMClassInfo_SVGPathElement_id,
-  eDOMClassInfo_SVGPatternElement_id,
-  eDOMClassInfo_SVGPolygonElement_id,
-  eDOMClassInfo_SVGPolylineElement_id,
-  eDOMClassInfo_SVGRadialGradientElement_id,
-  eDOMClassInfo_SVGRectElement_id,
-  eDOMClassInfo_SVGScriptElement_id,
-  eDOMClassInfo_SVGStopElement_id,
-  eDOMClassInfo_SVGStyleElement_id,
-  eDOMClassInfo_SVGSVGElement_id,
-  eDOMClassInfo_SVGSymbolElement_id,
-  eDOMClassInfo_SVGTextElement_id,
-  eDOMClassInfo_SVGTextPathElement_id,
-  eDOMClassInfo_SVGTitleElement_id,
-  eDOMClassInfo_SVGTSpanElement_id,
-  eDOMClassInfo_SVGUseElement_id,
-
-  // other SVG classes
-  eDOMClassInfo_SVGAngle_id,
-  eDOMClassInfo_SVGAnimatedAngle_id,
-  eDOMClassInfo_SVGAnimatedEnumeration_id,
-  eDOMClassInfo_SVGAnimatedInteger_id,
-  eDOMClassInfo_SVGAnimatedLength_id,
-  eDOMClassInfo_SVGAnimatedLengthList_id,
-  eDOMClassInfo_SVGAnimatedNumber_id,
-  eDOMClassInfo_SVGAnimatedNumberList_id,
-  eDOMClassInfo_SVGAnimatedPoints_id,
-  eDOMClassInfo_SVGAnimatedPreserveAspectRatio_id,
-  eDOMClassInfo_SVGAnimatedRect_id,
-  eDOMClassInfo_SVGAnimatedString_id,
-  eDOMClassInfo_SVGAnimatedTransformList_id,
-  eDOMClassInfo_SVGEvent_id,
-  eDOMClassInfo_SVGException_id,
-  eDOMClassInfo_SVGLength_id,
-  eDOMClassInfo_SVGLengthList_id,
-  eDOMClassInfo_SVGMatrix_id,
-  eDOMClassInfo_SVGNumber_id,
-  eDOMClassInfo_SVGNumberList_id,
-  eDOMClassInfo_SVGPathSegArcAbs_id,
-  eDOMClassInfo_SVGPathSegArcRel_id,
-  eDOMClassInfo_SVGPathSegClosePath_id,
-  eDOMClassInfo_SVGPathSegCurvetoCubicAbs_id,
-  eDOMClassInfo_SVGPathSegCurvetoCubicRel_id,
-  eDOMClassInfo_SVGPathSegCurvetoCubicSmoothAbs_id,
-  eDOMClassInfo_SVGPathSegCurvetoCubicSmoothRel_id,
-  eDOMClassInfo_SVGPathSegCurvetoQuadraticAbs_id,
-  eDOMClassInfo_SVGPathSegCurvetoQuadraticRel_id,
-  eDOMClassInfo_SVGPathSegCurvetoQuadraticSmoothAbs_id,
-  eDOMClassInfo_SVGPathSegCurvetoQuadraticSmoothRel_id,
-  eDOMClassInfo_SVGPathSegLinetoAbs_id,
-  eDOMClassInfo_SVGPathSegLinetoHorizontalAbs_id,
-  eDOMClassInfo_SVGPathSegLinetoHorizontalRel_id,
-  eDOMClassInfo_SVGPathSegLinetoRel_id,
-  eDOMClassInfo_SVGPathSegLinetoVerticalAbs_id,
-  eDOMClassInfo_SVGPathSegLinetoVerticalRel_id,
-  eDOMClassInfo_SVGPathSegList_id,
-  eDOMClassInfo_SVGPathSegMovetoAbs_id,
-  eDOMClassInfo_SVGPathSegMovetoRel_id,
-  eDOMClassInfo_SVGPoint_id,
-  eDOMClassInfo_SVGPointList_id,
-  eDOMClassInfo_SVGPreserveAspectRatio_id,
-  eDOMClassInfo_SVGRect_id,
-  eDOMClassInfo_SVGTransform_id,
-  eDOMClassInfo_SVGTransformList_id,
-  eDOMClassInfo_SVGZoomEvent_id,
-#endif // MOZ_SVG
-
-  // Canvas
-  eDOMClassInfo_HTMLCanvasElement_id,
-#ifdef MOZ_ENABLE_CANVAS
-  eDOMClassInfo_CanvasRenderingContext2D_id,
-  eDOMClassInfo_CanvasGradient_id,
-  eDOMClassInfo_CanvasPattern_id,
-#endif
-  
-  // SmartCard Events
-  eDOMClassInfo_SmartCardEvent_id,
-  
-  // PageTransition Events
-  eDOMClassInfo_PageTransitionEvent_id,
-
-  // WindowUtils
-  eDOMClassInfo_WindowUtils_id,
-
-  // XSLTProcessor
-  eDOMClassInfo_XSLTProcessor_id,
-
-  // DOM Level 3 XPath objects
-  eDOMClassInfo_XPathEvaluator_id,
-  eDOMClassInfo_XPathException_id,
-  eDOMClassInfo_XPathExpression_id,
-  eDOMClassInfo_XPathNSResolver_id,
-  eDOMClassInfo_XPathResult_id,
-
-  eDOMClassInfo_WindowRoot_id,
-
-  // We are now trying to preserve binary compat in classinfo.  No more
-  // putting things in those categories up there.  New entries are to be
-  // added here, which is the end of the things that are currently on by
-  // default.
-
-  // Define this near the end so that enabling/disabling foreignobject doesn't
-  // break binary compatibility
-#if defined(MOZ_SVG) && defined(MOZ_SVG_FOREIGNOBJECT)
-  eDOMClassInfo_SVGForeignObjectElement_id,
-#endif
-
-  // This one better be the last one in this list
-  eDOMClassInfoIDCount
-};
-
+#include "nsDOMClassInfoID.h"
 #include "nsIXPCScriptable.h"
 
 #define DEFAULT_SCRIPTABLE_FLAGS                                           \

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -72,6 +72,7 @@
 #include "nsIWebBrowserPersist.h"
 #include "nsCWebBrowserPersist.h"
 #include "nsIServiceManager.h"
+#include "nsAutoPtr.h"
 
 // for painting the background window
 #include "nsIRenderingContext.h"

layout/base/nsCSSFrameConstructor.cpp

@@ -115,6 +115,7 @@
 #include "nsIBoxLayout.h"
 #include "nsImageFrame.h"
 #include "nsIObjectLoadingContent.h"
+#include "nsContentErrors.h"
 
 static NS_DEFINE_CID(kEventQueueServiceCID,   NS_EVENTQUEUESERVICE_CID);
 
@@ -250,6 +251,7 @@ NS_NewSVGLeafFrame(nsIPresShell* aPresShell);
 #include "nsWidgetsCID.h"
 #include "nsNodeInfoManager.h"
 #include "nsContentCreatorFunctions.h"
+#include "nsIServiceManager.h"
 
 // Global object maintenance
 nsIXBLService * nsCSSFrameConstructor::gXBLService = nsnull;

layout/base/nsIPresShell.h

@@ -58,7 +58,6 @@
 #include "nsEvent.h"
 #include "nsReflowType.h"
 #include "nsCompatibility.h"
-#include "nsCOMArray.h"
 #include "nsFrameManagerBase.h"
 #include "mozFlushType.h"
 #include "nsWeakReference.h"
@@ -91,6 +90,7 @@ class nsIStyleFrameConstruction;
 class nsIStyleSheet;
 class nsCSSFrameConstructor;
 class nsISelection;
+template<class E> class nsCOMArray;
 
 #define NS_IPRESSHELL_IID     \
 { 0x998cde06, 0x5fa4, 0x4c8b, \

layout/generic/nsBlockFrame.cpp

@@ -82,6 +82,7 @@
 #include "nsLayoutUtils.h"
 #include "nsBoxLayoutState.h"
 #include "nsDisplayList.h"
+#include "nsContentErrors.h"
 
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"

layout/generic/nsContainerFrame.cpp

@@ -62,6 +62,7 @@
 #include "nsRegion.h"
 #include "nsLayoutErrors.h"
 #include "nsDisplayList.h"
+#include "nsContentErrors.h"
 
 #ifdef NS_DEBUG
 #undef NOISY

layout/style/nsCSSLoader.cpp

@@ -87,6 +87,7 @@
 #include "nsIDOMStyleSheet.h"
 #include "nsIDOMCSSStyleSheet.h"
 #include "nsIDOMCSSImportRule.h"
+#include "nsContentErrors.h"
 
 #ifdef MOZ_LOGGING
 // #define FORCE_PR_LOG /* Allow logging in the release build */

layout/style/nsCSSRules.cpp

@@ -64,6 +64,7 @@
 #include "nsContentUtils.h"
 #include "nsStyleConsts.h"
 #include "nsDOMError.h"
+#include "nsIEnumerator.h"
 
 #define IMPL_STYLE_RULE_INHERIT(_class, super) \
 NS_IMETHODIMP _class::GetStyleSheet(nsIStyleSheet*& aSheet) const { return super::GetStyleSheet(aSheet); }  \
@@ -1447,4 +1448,3 @@ CSSNameSpaceRuleImpl::GetParentRule(nsIDOMCSSRule** aParentRule)
   *aParentRule = nsnull;
   return NS_OK;
 }
-

layout/style/nsHTMLStyleSheet.cpp

@@ -63,6 +63,7 @@
 #include "nsCSSAnonBoxes.h"
 #include "nsRuleWalker.h"
 #include "nsRuleData.h"
+#include "nsContentErrors.h"
 
 NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet::HTMLColorRule, nsIStyleRule)
 

layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp

@@ -63,6 +63,7 @@ extern "C" {
 #include "gfxIImageFrame.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsVoidArray.h"
 
 #ifdef XP_MACOSX
 #include "nsIDrawingSurfaceMac.h"
@@ -836,4 +837,3 @@ nsSVGCairoCanvas::CompositeSurfaceMatrix(nsISVGRendererSurface *aSurface,
 
   return NS_OK;
 }
-