Backed out bug 669310, bug 668013, bug 667887 and bug 669886 due to build bustage.

content/base/public/nsContentUtils.h

@@ -79,13 +79,13 @@ static fp_except_t oldmask = fpsetmask(~allmask);
 #include "mozilla/AutoRestore.h"
 #include "nsINode.h"
 #include "nsHashtable.h"
-#include "nsIDOMNode.h"
 
 struct nsNativeKeyEvent; // Don't include nsINativeKeyBindings.h here: it will force strange compilation error!
 
 class nsIDOMScriptObjectFactory;
 class nsIXPConnect;
 class nsIContent;
+class nsIDOMNode;
 class nsIDOMKeyEvent;
 class nsIDocument;
 class nsIDocumentObserver;
@@ -122,6 +122,7 @@ struct JSRuntime;
 class nsIUGenCategory;
 class nsIWidget;
 class nsIDragSession;
+class nsPIDOMWindow;
 class nsIPresShell;
 class nsIXPConnectJSObjectHolder;
 #ifdef MOZ_XTF

content/base/public/nsIDocument.h

@@ -69,7 +69,6 @@
 #include "nsIAnimationFrameListener.h"
 #include "nsEventStates.h"
 #include "nsIStructuredCloneContainer.h"
-#include "nsDOMMemoryReporter.h"
 
 class nsIContent;
 class nsPresContext;
@@ -150,7 +149,6 @@ public:
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_IID)
   NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-  NS_DECL_DOM_MEMORY_REPORTER_SIZEOF
 
 #ifdef MOZILLA_INTERNAL_API
   nsIDocument()
@@ -1533,6 +1531,8 @@ public:
 #undef DEPRECATED_OPERATION
   void WarnOnceAbout(DeprecatedOperations aOperation);
 
+  PRInt64 SizeOf() const;
+
 private:
   PRUint32 mWarnedAbout;
 

content/base/src/nsContentList.h

@@ -56,7 +56,7 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "nsCRT.h"
-#include "nsHashKeys.h"
+#include "mozilla/dom/Element.h"
 
 // Magic namespace id that means "match all namespaces".  This is
 // negative so it won't collide with actual namespace constants.
@@ -74,11 +74,6 @@ typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent,
 typedef void (*nsContentListDestroyFunc)(void* aData);
 
 class nsIDocument;
-namespace mozilla {
-namespace dom {
-class Element;
-}
-}
 
 
 class nsBaseContentList : public nsINodeList

content/base/src/nsCopySupport.cpp

@@ -79,8 +79,6 @@
 #include "nsContentUtils.h"
 #include "nsContentCID.h"
 
-#include "mozilla/dom/Element.h"
-
 nsresult NS_NewDomSelection(nsISelection **aDomSelection);
 
 static NS_DEFINE_CID(kCClipboardCID,           NS_CLIPBOARD_CID);

content/base/src/nsDocument.cpp

@@ -8383,11 +8383,3 @@ nsIDocument::SizeOf() const
   return size;
 }
 
-PRInt64
-nsDocument::SizeOf() const
-{
-  PRInt64 size = MemoryReporter::GetBasicSize<nsDocument, nsIDocument>(this);
-  size += mAttrStyleSheet ? mAttrStyleSheet->SizeOf() : 0;
-  return size;
-}
-

content/base/src/nsDocument.h

@@ -499,7 +499,6 @@ public:
   typedef mozilla::dom::Element Element;
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_DOM_MEMORY_REPORTER_SIZEOF
 
   using nsINode::GetScriptTypeID;
 

content/base/src/nsFrameLoader.h

@@ -53,8 +53,8 @@
 #include "nsAutoPtr.h"
 #include "nsFrameMessageManager.h"
 #include "Layers.h"
-#include "nsIContent.h"
 
+class nsIContent;
 class nsIURI;
 class nsSubDocumentFrame;
 class nsIView;

content/base/src/nsImageLoadingContent.cpp

@@ -79,7 +79,6 @@
 #include "nsSVGEffects.h"
 
 #include "mozAutoDocUpdate.h"
-#include "mozilla/dom/Element.h"
 
 #ifdef DEBUG_chb
 static void PrintReqURL(imgIRequest* req) {

content/base/src/nsImageLoadingContent.h

@@ -52,7 +52,6 @@
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsString.h"
-#include "nsEventStates.h"
 
 class nsIURI;
 class nsIDocument;

content/base/src/nsMappedAttributeElement.h

@@ -46,7 +46,6 @@
 #define NS_MAPPEDATTRIBUTEELEMENT_H_
 
 #include "nsStyledElement.h"
-#include "nsDOMMemoryReporter.h"
 
 class nsMappedAttributes;
 struct nsRuleData;
@@ -66,9 +65,6 @@ protected:
   {}
 
 public:
-  NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsMappedAttributeElement,
-                                              nsMappedAttributeElementBase)
-
   virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                               nsIContent* aBindingParent,
                               PRBool aCompileEventHandlers);

content/base/src/nsMappedAttributes.h

@@ -108,12 +108,6 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  PRInt64 SizeOf() const {
-    NS_ASSERTION(mAttrCount == mBufferSize,
-                 "mBufferSize and mAttrCount are expected to be the same.");
-    return sizeof(*this) - sizeof(void*) + mAttrCount * sizeof(InternalAttr);
-  }
-
 private:
   nsMappedAttributes(const nsMappedAttributes& aCopy);
   ~nsMappedAttributes();

content/base/src/nsNodeInfo.cpp

@@ -55,8 +55,6 @@
 #include NEW_H
 #include "nsFixedSizeAllocator.h"
 #include "prprf.h"
-#include "nsIDocument.h"
-#include "nsGkAtoms.h"
 
 static const size_t kNodeInfoPoolSizes[] = {
   sizeof(nsNodeInfo)

content/base/src/nsObjectLoadingContent.cpp

@@ -96,7 +96,6 @@
 #include "nsIContentSecurityPolicy.h"
 #include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"
-#include "mozilla/dom/Element.h"
 
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gObjectLog = PR_NewLogModule("objlc");

content/base/src/nsStyledElement.h

@@ -48,7 +48,6 @@
 
 #include "nsString.h"
 #include "nsGenericElement.h"
-#include "nsDOMMemoryReporter.h"
 
 namespace mozilla {
 namespace css {
@@ -69,9 +68,6 @@ protected:
 
 public:
 
-  NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsStyledElementNotElementCSSInlineStyle,
-                                              nsStyledElementBase)
-
   // nsIContent interface methods
   virtual nsIAtom* GetClassAttributeName() const;
   virtual nsIAtom* GetIDAttributeName() const;
@@ -119,10 +115,6 @@ protected:
 };
 
 class nsStyledElement : public nsStyledElementNotElementCSSInlineStyle {
-public:
-  NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsStyledElement,
-                                              nsStyledElementNotElementCSSInlineStyle)
-
 protected:
   inline nsStyledElement(already_AddRefed<nsINodeInfo> aNodeInfo)
     : nsStyledElementNotElementCSSInlineStyle(aNodeInfo)

content/base/src/nsTreeWalker.cpp

@@ -47,8 +47,6 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMNodeFilter.h"
 #include "nsDOMError.h"
-#include "nsINode.h"
-#include "nsIContent.h"
 
 #include "nsContentUtils.h"
 

content/html/content/src/nsGenericHTMLElement.cpp

@@ -3228,16 +3228,6 @@ nsGenericHTMLFrameElement::CopyInnerTo(nsGenericElement* aDest) const
   return rv;
 }
 
-PRInt64
-nsGenericHTMLFrameElement::SizeOf() const
-{
-  PRInt64 size = MemoryReporter::GetBasicSize<nsGenericHTMLFrameElement,
-                                              nsGenericHTMLElement>(this);
-  // TODO: need to implement SizeOf() in nsFrameLoader, bug 672539.
-  size += mFrameLoader ? sizeof(*mFrameLoader.get()) : 0;
-  return size;
-}
-
 //----------------------------------------------------------------------
 
 nsresult

content/html/content/src/nsGenericHTMLElement.h

@@ -46,7 +46,6 @@
 #include "nsFrameLoader.h"
 #include "nsGkAtoms.h"
 #include "nsContentCreatorFunctions.h"
-#include "nsDOMMemoryReporter.h"
 
 class nsIDOMAttr;
 class nsIDOMEventListener;
@@ -82,9 +81,6 @@ public:
                  "Unexpected namespace");
   }
 
-  NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsGenericHTMLElement,
-                                              nsGenericHTMLElementBase)
-
   /** Typesafe, non-refcounting cast from nsIContent.  Cheaper than QI. **/
   static nsGenericHTMLElement* FromContent(nsIContent *aContent)
   {
@@ -824,9 +820,6 @@ public:
   nsGenericHTMLFormElement(already_AddRefed<nsINodeInfo> aNodeInfo);
   virtual ~nsGenericHTMLFormElement();
 
-  NS_DECL_AND_IMPL_DOM_MEMORY_REPORTER_SIZEOF(nsGenericHTMLFormElement,
-                                              nsGenericHTMLElement)
-
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
 
   virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
@@ -1013,8 +1006,6 @@ public:
   }
   virtual ~nsGenericHTMLFrameElement();
 
-  NS_DECL_DOM_MEMORY_REPORTER_SIZEOF
-
   // nsISupports
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
 

content/xbl/src/nsXBLBinding.cpp

@@ -104,8 +104,6 @@
 #include "nsDOMClassInfo.h"
 #include "nsJSUtils.h"
 
-#include "mozilla/dom/Element.h"
-
 // Helper classes
 
 /***********************************************************************/

content/xbl/src/nsXBLPrototypeBinding.cpp

@@ -74,7 +74,6 @@
 
 #include "nsIStyleRuleProcessor.h"
 #include "nsXBLResourceLoader.h"
-#include "mozilla/dom/Element.h"
 
 // Helper Classes =====================================================================
 

content/xbl/src/nsXBLService.cpp

@@ -89,7 +89,6 @@
 #endif
 #include "nsIDOMEventListener.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 

content/xbl/src/nsXBLWindowKeyHandler.cpp

@@ -69,7 +69,6 @@
 #include "nsISelectionController.h"
 #include "nsGUIEvent.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 

content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp

@@ -54,7 +54,6 @@
 #include "nsUnicharUtils.h"
 #include "nsAttrName.h"
 #include "nsTArray.h"
-#include "mozilla/dom/Element.h"
 
 const PRUint32 kUnknownIndex = PRUint32(-1);
 

content/xul/content/src/nsXULPopupListener.cpp

@@ -71,7 +71,6 @@
 #include "nsHTMLReflowState.h"
 #include "nsIObjectLoadingContent.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/dom/Element.h"
 
 // for event firing in context menus
 #include "nsPresContext.h"

dom/base/nsDOMNavigationTiming.h

@@ -46,9 +46,9 @@
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "TimeStamp.h"
-#include "nsIURI.h"
 
 class nsDOMNavigationTimingClock;
+class nsIURI;
 class nsIDocument;
 
 class nsDOMNavigationTiming

dom/base/nsJSUtils.cpp

@@ -57,7 +57,6 @@
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsPIDOMWindow.h"
 
 #include "nsDOMJSUtils.h" // for GetScriptContextFromJSContext
 

dom/plugins/base/nsNPAPIPluginInstance.cpp

@@ -59,7 +59,6 @@
 #include "nsPluginStreamListenerPeer.h"
 #include "nsSize.h"
 #include "nsNetCID.h"
-#include "nsIContent.h"
 
 using namespace mozilla;
 using namespace mozilla::plugins::parent;

dom/src/notification/nsDesktopNotification.h

@@ -57,7 +57,6 @@
 
 #include "nsDOMEventTargetHelper.h"
 #include "nsIPrivateDOMEvent.h"
-#include "nsIDocument.h"
 
 class AlertServiceObserver;
 

editor/libeditor/html/nsHTMLEditor.cpp

@@ -99,7 +99,6 @@
 
 #include "nsIFrame.h"
 #include "nsIParserService.h"
-#include "mozilla/dom/Element.h"
 
 // Some utilities to handle annoying overloading of "A" tag for link and named anchor
 static char hrefText[] = "href";

layout/base/nsDocumentViewer.cpp

@@ -195,8 +195,6 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 //switch to page layout
 #include "nsGfxCIID.h"
 
-#include "mozilla/dom/Element.h"
-
 using namespace mozilla;
 
 #ifdef NS_DEBUG

layout/forms/nsButtonFrameRenderer.cpp

@@ -45,7 +45,6 @@
 #include "nsITheme.h"
 #include "nsThemeConstants.h"
 #include "nsEventStates.h"
-#include "mozilla/dom/Element.h"
 
 #define ACTIVE   "active"
 #define HOVER    "hover"

layout/generic/nsSelection.cpp

@@ -113,7 +113,6 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 #endif // IBMBIDI
 
 #include "nsDOMError.h"
-#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 

layout/inspector/src/inDOMUtils.cpp

@@ -59,8 +59,6 @@
 #include "nsEventStateManager.h"
 #include "nsIAtom.h"
 #include "nsIRange.h"
-#include "mozilla/dom/Element.h"
-
 
 ///////////////////////////////////////////////////////////////////////////////
 

layout/style/nsHTMLStyleSheet.cpp

@@ -528,43 +528,6 @@ nsHTMLStyleSheet::List(FILE* out, PRInt32 aIndent) const
 }
 #endif
 
-static
-PLDHashOperator
-GetHashEntryAttributesSize(PLDHashTable* aTable, PLDHashEntryHdr* aEntry,
-                           PRUint32 number, void* aArg)
-{
-  NS_PRECONDITION(aEntry, "The entry should not be null!");
-  NS_PRECONDITION(aArg, "The passed argument should not be null!");
-
-  MappedAttrTableEntry* entry = static_cast<MappedAttrTableEntry*>(aEntry);
-  PRInt64 size = *static_cast<PRInt64*>(aArg);
-
-  NS_ASSERTION(entry->mAttributes, "entry->mAttributes should not be null!");
-  size += entry->mAttributes->SizeOf();
-
-  return PL_DHASH_NEXT;
-}
-
-PRInt64
-nsHTMLStyleSheet::SizeOf() const
-{
-  PRInt64 size = sizeof(*this);
-
-  size += mLinkRule ? sizeof(*mLinkRule.get()) : 0;
-  size += mVisitedRule ? sizeof(*mVisitedRule.get()) : 0;
-  size += mActiveRule ? sizeof(*mActiveRule.get()) : 0;
-  size += mTableQuirkColorRule ? sizeof(*mTableQuirkColorRule.get()) : 0;
-  size += mTableTHRule ? sizeof(*mTableTHRule.get()) : 0;
-
-  if (mMappedAttrTable.ops) {
-    size += PL_DHASH_TABLE_SIZE(&mMappedAttrTable) * sizeof(MappedAttrTableEntry);
-    PL_DHashTableEnumerate(const_cast<PLDHashTable*>(&mMappedAttrTable),
-                           GetHashEntryAttributesSize, &size);
-  }
-
-  return size;
-}
-
 // XXX For convenience and backwards compatibility
 nsresult
 NS_NewHTMLStyleSheet(nsHTMLStyleSheet** aInstancePtrResult, nsIURI* aURL, 
@@ -604,4 +567,3 @@ NS_NewHTMLStyleSheet(nsHTMLStyleSheet** aInstancePtrResult)
   *aInstancePtrResult = it; // NS_ADDREF above, or set to null by NS_RELEASE
   return rv;
 }
-

layout/style/nsHTMLStyleSheet.h

@@ -101,7 +101,6 @@ public:
     UniqueMappedAttributes(nsMappedAttributes* aMapped);
   void DropMappedAttributes(nsMappedAttributes* aMapped);
 
-  PRInt64 SizeOf() const;
 
 private: 
   // These are not supported and are not implemented! 

layout/xul/base/src/nsButtonBoxFrame.cpp

@@ -52,8 +52,6 @@
 #include "nsIDOMElement.h"
 #include "nsDisplayList.h"
 #include "nsContentUtils.h"
-#include "mozilla/dom/Element.h"
-
 
 //
 // NS_NewXULButtonFrame

layout/xul/base/src/nsResizerFrame.cpp

@@ -60,8 +60,6 @@
 #include "nsContentUtils.h"
 #include "nsMenuPopupFrame.h"
 #include "nsIScreenManager.h"
-#include "mozilla/dom/Element.h"
-
 
 //
 // NS_NewResizerFrame

layout/xul/base/src/nsXULTooltipListener.cpp

@@ -61,8 +61,6 @@
 #include "nsIRootBox.h"
 #include "nsEventDispatcher.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/dom/Element.h"
-
 
 using namespace mozilla;
 

toolkit/components/typeaheadfind/nsTypeAheadFind.cpp

@@ -88,7 +88,6 @@
 #include "nsIWindowWatcher.h"
 #include "nsIObserverService.h"
 #include "nsFocusManager.h"
-#include "mozilla/dom/Element.h"
 
 #include "nsTypeAheadFind.h"
 

widget/src/xpwidgets/nsNativeTheme.cpp

@@ -54,7 +54,6 @@
 #include "nsPIDOMWindow.h"
 #include "nsProgressFrame.h"
 #include "nsMenuFrame.h"
-#include "mozilla/dom/Element.h"
 
 nsNativeTheme::nsNativeTheme()
 : mAnimatedContentTimeout(PR_UINT32_MAX)