Back out Bug 887533 for test failures.

content/base/public/nsINodeList.h

@@ -8,7 +8,9 @@
 
 #include "nsIDOMNodeList.h"
 #include "nsWrapperCache.h"
-#include "nsIContent.h"
+
+class nsINode;
+class nsIContent;
 
 // IID for the nsINodeList interface
 #define NS_INODELIST_IID \

content/base/src/nsDOMAttributeMap.h

@@ -23,6 +23,12 @@ class nsIAtom;
 class nsINodeInfo;
 class nsIDocument;
 
+namespace mozilla {
+namespace dom {
+class Element;
+} // namespace dom
+} // namespace mozilla
+
 /**
  * Structure used as a key for caching Attrs in nsDOMAttributeMap's mAttributeCache.
  */
@@ -205,9 +211,5 @@ private:
   already_AddRefed<Attr> RemoveAttribute(nsINodeInfo* aNodeInfo);
 };
 
-// XXX khuey yes this is crazy.  The bindings code needs to see this include,
-// but if we pull it in at the top of the file we get a circular include
-// problem.
-#include "mozilla/dom/Element.h"
 
 #endif /* nsDOMAttributeMap_h */

content/base/src/nsXMLHttpRequest.h

@@ -14,7 +14,6 @@
 #include "nsIURI.h"
 #include "nsIHttpChannel.h"
 #include "nsIDocument.h"
-#include "nsIContent.h"
 #include "nsIStreamListener.h"
 #include "nsWeakReference.h"
 #include "jsapi.h"

content/html/content/src/HTMLPropertiesCollection.h

@@ -19,8 +19,8 @@
 #include "nsIHTMLCollection.h"
 #include "nsHashKeys.h"
 #include "nsRefPtrHashtable.h"
-#include "nsGenericHTMLElement.h"
 
+class nsGenericHTMLElement;
 class nsIDocument;
 class nsINode;
 

content/svg/content/src/SVGAnimatedRect.h

@@ -11,8 +11,8 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
-#include "nsSVGElement.h"
 
+class nsSVGElement;
 class nsSVGViewBox;
 
 namespace mozilla {

content/svg/content/src/SVGPreserveAspectRatio.h

@@ -11,7 +11,8 @@
 #include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/ErrorResult.h"
-#include "nsSVGElement.h"
+
+class nsSVGElement;
 
 namespace mozilla {
 // Alignment Types

dom/base/BarProps.h

@@ -16,10 +16,10 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "nsAutoPtr.h"
-#include "nsPIDOMWindow.h"
 
 class nsGlobalWindow;
 class nsIWebBrowserChrome;
+class nsPIDOMWindow;
 
 namespace mozilla {
 

dom/base/Crypto.h

@@ -11,13 +11,13 @@
 class nsIDOMCRMFObject;
 #endif
 
-#include "nsPIDOMWindow.h"
-
 #include "nsWrapperCache.h"
 #include "mozilla/dom/TypedArray.h"
 #define NS_DOMCRYPTO_CID \
   {0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
 
+class nsPIDOMWindow;
+
 namespace mozilla {
 
 class ErrorResult;

dom/base/DOMError.h

@@ -11,7 +11,8 @@
 #include "nsWrapperCache.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
-#include "nsPIDOMWindow.h"
+
+class nsPIDOMWindow;
 
 namespace mozilla {
 

dom/base/nsMimeTypeArray.h

@@ -12,8 +12,8 @@
 #include "nsWrapperCache.h"
 #include "nsIWeakReferenceUtils.h"
 #include "nsAutoPtr.h"
-#include "nsPIDOMWindow.h"
 
+class nsPIDOMWindow;
 class nsMimeType;
 class nsPluginElement;
 

dom/base/nsPerformance.h

@@ -11,9 +11,9 @@
 #include "nsWrapperCache.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsContentUtils.h"
-#include "nsIDOMWindow.h"
 
 class nsITimedChannel;
+class nsIDOMWindow;
 class nsPerformance;
 class JSObject;
 struct JSContext;

dom/bindings/Codegen.py

@@ -8605,7 +8605,6 @@ class CGBindingRoot(CGThing):
         hasChromeOnly = any(descriptorHasChromeOnly(d) for d in descriptors)
         # XXXkhuey ugly hack but this is going away soon.
         isEventTarget = webIDLFile.endswith("EventTarget.webidl")
-        needsDOMQS = any(d.hasXPConnectImpls for d in descriptors)
         hasWorkerStuff = len(config.getDescriptors(webIDLFile=webIDLFile,
                                                    workers=True)) != 0
         dictionaries = config.getDictionaries(webIDLFile=webIDLFile)
@@ -8704,6 +8703,9 @@ class CGBindingRoot(CGThing):
                           'mozilla/dom/Nullable.h',
                           'PrimitiveConversions.h',
                           'WrapperFactory.h',
+                          # Have to include nsDOMQS.h to get fast arg unwrapping
+                          # for old-binding things with castability.
+                          'nsDOMQS.h'
                           ] + (['WorkerPrivate.h',
                                 'nsThreadUtils.h'] if hasWorkerStuff else [])
                             + (['mozilla/Preferences.h'] if requiresPreferences else [])
@@ -8712,8 +8714,6 @@ class CGBindingRoot(CGThing):
                             + (['nsCxPusher.h'] if dictionaries else [])
                             + (['AccessCheck.h'] if hasChromeOnly else [])
                             + (['xpcprivate.h'] if isEventTarget else [])
-                            + (['nsPIDOMWindow.h'] if len(jsImplemented) != 0 else [])
-                            + (['nsDOMQS.h'] if needsDOMQS else [])
                             + (['AtomList.h'] if requiresAtoms else []),
                          prefix,
                          curr,

dom/camera/DOMCameraManager.h

@@ -20,7 +20,8 @@
 #include "nsIDOMCameraManager.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
-#include "nsPIDOMWindow.h"
+
+class nsPIDOMWindow;
 
 namespace mozilla {
   class ErrorResult;

dom/promise/Promise.h

@@ -14,9 +14,9 @@
 #include "mozilla/dom/PromiseBinding.h"
 #include "nsWrapperCache.h"
 #include "nsAutoPtr.h"
-#include "nsPIDOMWindow.h"
 
 struct JSContext;
+class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {

dom/src/geolocation/nsGeolocation.h

@@ -31,12 +31,12 @@
 
 #include "nsIGeolocationProvider.h"
 #include "nsIContentPermissionPrompt.h"
-#include "nsIDOMWindow.h"
 #include "DictionaryHelpers.h"
 #include "PCOMContentPermissionRequestChild.h"
 #include "mozilla/Attributes.h"
 
 class nsGeolocationService;
+class nsIDOMWindow;
 
 namespace mozilla {
 namespace dom {

layout/style/nsICSSDeclaration.h

@@ -30,13 +30,14 @@
 #include "mozilla/ErrorResult.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
-#include "nsINode.h"
 
 // dbeabbfa-6cb3-4f5c-aec2-dd558d9d681f
 #define NS_ICSSDECLARATION_IID \
 { 0xdbeabbfa, 0x6cb3, 0x4f5c, \
  { 0xae, 0xc2, 0xdd, 0x55, 0x8d, 0x9d, 0x68, 0x1f } }
 
+class nsINode;
+
 class nsICSSDeclaration : public nsIDOMCSSStyleDeclaration,
                           public nsWrapperCache
 {