From bf42e48d0ef2dfe1d22f3b1127dd686196d67df7 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Sat, 4 May 2013 03:55:53 -0400
Subject: [PATCH] [Bug 868701] Remove classinfo for Attr r=Ms2ger

---
 content/base/src/Attr.cpp        |  3 ---
 content/base/src/Attr.h          | 10 ++++------
 dom/base/nsDOMClassInfo.cpp      | 18 ------------------
 dom/base/nsDOMClassInfo.h        | 21 ---------------------
 dom/base/nsDOMClassInfoClasses.h |  1 -
 5 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/content/base/src/Attr.cpp b/content/base/src/Attr.cpp
index 35fcbc031c5c..a9167cb85dee 100644
--- a/content/base/src/Attr.cpp
+++ b/content/base/src/Attr.cpp
@@ -29,8 +29,6 @@
 #include "nsAsyncDOMEvent.h"
 #include "nsWrapperCacheInlines.h"
 
-DOMCI_NODE_DATA(Attr, mozilla::dom::Attr)
-
 namespace mozilla {
 namespace dom {
 
@@ -78,7 +76,6 @@ NS_INTERFACE_TABLE_HEAD(Attr)
                                  new nsNodeSupportsWeakRefTearoff(this))
   NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMXPathNSResolver,
                                  new nsNode3Tearoff(this))
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Attr)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(Attr)
diff --git a/content/base/src/Attr.h b/content/base/src/Attr.h
index 9fe42faa9daa..f9d2ed01ddd9 100644
--- a/content/base/src/Attr.h
+++ b/content/base/src/Attr.h
@@ -41,10 +41,10 @@ public:
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
   virtual void GetTextContentInternal(nsAString& aTextContent);
   virtual void SetTextContentInternal(const nsAString& aTextContent,
-                                      mozilla::ErrorResult& aError);
+                                      ErrorResult& aError);
   virtual void GetNodeValueInternal(nsAString& aNodeValue);
   virtual void SetNodeValueInternal(const nsAString& aNodeValue,
-                                    mozilla::ErrorResult& aError);
+                                    ErrorResult& aError);
 
   // nsIDOMAttr interface
   NS_DECL_NSIDOMATTR
@@ -75,8 +75,6 @@ public:
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Attr,
                                                          nsIAttribute)
 
-  virtual nsXPCClassInfo* GetClassInfo();
-
   virtual nsIDOMNode* AsDOMNode() { return this; }
 
   // WebIDL
@@ -97,7 +95,7 @@ public:
   Element* GetOwnerElement(ErrorResult& aRv);
 
 protected:
-  virtual mozilla::dom::Element* GetNameSpaceElement()
+  virtual Element* GetNameSpaceElement()
   {
     return GetContentInternal();
   }
@@ -106,7 +104,7 @@ protected:
 
 private:
   already_AddRefed<nsIAtom> GetNameAtom(nsIContent* aContent);
-  mozilla::dom::Element* GetContentInternal() const;
+  Element* GetContentInternal() const;
 
   nsString mValue;
 };
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 623cbc843cda..ef8e02c9fe02 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -57,7 +57,6 @@
 #include "nsGlobalWindow.h"
 #include "nsHistory.h"
 #include "nsIContent.h"
-#include "nsIAttribute.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMEvent.h"
@@ -152,7 +151,6 @@
 // includes needed for the prototype chain interfaces
 #include "nsIDOMNavigator.h"
 #include "nsIDOMBarProp.h"
-#include "mozilla/dom/Attr.h"
 #include "nsIDOMDataContainerEvent.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIDOMCompositionEvent.h"
@@ -558,8 +556,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(Element, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(Attr, nsAttributeSH,
-                           NODE_SCRIPTABLE_FLAGS)
 
   // Misc Core related classes
 
@@ -1709,11 +1705,6 @@ nsDOMClassInfo::Init()
                                         nsDOMTouchEvent::PrefEnabled())
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(Attr, nsIDOMAttr)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMAttr)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(Event, nsIDOMEvent)
     DOM_CLASSINFO_EVENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
@@ -7563,15 +7554,6 @@ nsNonDOMObjectSH::GetFlags(uint32_t *aFlags)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsAttributeSH::GetFlags(uint32_t *aFlags)
-{
-  // Just like nsNodeSH, but without CONTENT_NODE
-  *aFlags = DOMCLASSINFO_STANDARD_FLAGS;
-
-  return NS_OK;
-}
-
 // nsOfflineResourceListSH
 nsresult
 nsOfflineResourceListSH::GetStringAt(nsISupports *aNative, int32_t aIndex,
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index 1d0b46c19256..7100a31272e2 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -1076,27 +1076,6 @@ public:
   }
 };
 
-// Need this to override GetFlags() on nsNodeSH
-class nsAttributeSH : public nsNodeSH
-{
-protected:
-  nsAttributeSH(nsDOMClassInfoData* aData) : nsNodeSH(aData)
-  {
-  }
-
-  virtual ~nsAttributeSH()
-  {
-  }
-
-public:
-  NS_IMETHOD GetFlags(uint32_t *aFlags);
-
-  static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
-  {
-    return new nsAttributeSH(aData);
-  }
-};
-
 class nsOfflineResourceListSH : public nsStringArraySH
 {
 protected:
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index c4211ce55de5..3f1d537e4d35 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -18,7 +18,6 @@ DOMCI_CLASS(DOMConstructor)
 // Core classes
 DOMCI_CLASS(DOMException)
 DOMCI_CLASS(Element)
-DOMCI_CLASS(Attr)
 
 // Event classes
 DOMCI_CLASS(Event)