Bug 1432186 part 18. Remove no-longer-needed nsIDOMNode-forwarding defines. r=mccr8

MozReview-Commit-ID: FbP5fVQ3c6m
2024-11-24 05:11:16 +00:00 · 2018-01-29 23:10:52 -05:00 · 2018-01-29 23:10:52 -05:00 · b6b8acada6
commit b6b8acada6
parent 4d88c28e4d
16 changed files with 1 additions and 47 deletions
--- a/dom/base/Attr.h
+++ b/dom/base/Attr.h
@ -41,8 +41,7 @@ public:

  NS_DECL_CYCLE_COLLECTING_ISUPPORTS

-  // nsIDOMNode interface
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
+  // nsINode interface
  virtual void GetTextContentInternal(nsAString& aTextContent,
                                      OOMReporter& aError) override;
  virtual void SetTextContentInternal(const nsAString& aTextContent,
--- a/dom/base/Comment.h
+++ b/dom/base/Comment.h
@ -42,9 +42,6 @@ public:
  // nsISupports
  NS_DECL_ISUPPORTS_INHERITED

-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  // nsIDOMCharacterData
  NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
--- a/dom/base/DocumentFragment.h
+++ b/dom/base/DocumentFragment.h
@ -45,9 +45,6 @@ public:
  NS_DECL_ISUPPORTS_INHERITED
  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DocumentFragment, FragmentOrElement)

-  // interface nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  // interface nsIDOMDocumentFragment
  NS_DECL_NSIDOMDOCUMENTFRAGMENT

--- a/dom/base/DocumentType.h
+++ b/dom/base/DocumentType.h
@ -34,9 +34,6 @@ public:
    : nsGenericDOMDataNode(aNodeInfo)
  {
  }
-
-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
 };

 class DocumentType final : public DocumentTypeForward
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@ -641,9 +641,6 @@ private:
  void SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages);

 public:
-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE_OVERRIDABLE
-
  // nsIDOMDocument
  NS_DECL_NSIDOMDOCUMENT

--- a/dom/base/nsINode.h
+++ b/dom/base/nsINode.h
@ -2258,8 +2258,4 @@ ToCanonicalSupports(nsINode* aPointer)
  return aPointer;
 }

-#define NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
-#define NS_FORWARD_NSIDOMNODE_TO_NSINODE_OVERRIDABLE
-
 #endif /* nsINode_h___ */
--- a/dom/base/nsTextNode.h
+++ b/dom/base/nsTextNode.h
@ -47,10 +47,6 @@ public:
  // nsISupports
  NS_DECL_ISUPPORTS_INHERITED

-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-  using mozilla::dom::Text::GetParentElement;
-
  // nsIDOMCharacterData
  NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
--- a/dom/html/nsGenericHTMLElement.h
+++ b/dom/html/nsGenericHTMLElement.h
@ -270,8 +270,6 @@ public:
  nsSize GetWidthHeightForImage(RefPtr<imgRequestProxy>& aImageRequest);

  // XPIDL methods
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  NS_FORWARD_NSIDOMELEMENT_TO_GENERIC

  NS_IMETHOD GetSpellcheck(bool* aSpellcheck) final override {
--- a/dom/html/nsHTMLDocument.h
+++ b/dom/html/nsHTMLDocument.h
@ -94,9 +94,6 @@ public:
  using nsDocument::GetLastStyleSheetSet;
  using nsDocument::MozSetImageElement;

-  // nsIDOMNode interface
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  // nsIDOMHTMLDocument interface
  NS_DECL_NSIDOMHTMLDOCUMENT

--- a/dom/mathml/nsMathMLElement.h
+++ b/dom/mathml/nsMathMLElement.h
@ -39,7 +39,6 @@ public:

  // Forward implementations of parent interfaces of nsMathMLElement to
  // our base class
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
  NS_FORWARD_NSIDOMELEMENT_TO_GENERIC

  nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
--- a/dom/svg/nsSVGElement.h
+++ b/dom/svg/nsSVGElement.h
@ -134,7 +134,6 @@ public:
  static const MappedAttributeEntry sLightingEffectsMap[];
  static const MappedAttributeEntry sMaskMap[];

-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
  NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
  NS_DECL_NSIDOMSVGELEMENT

--- a/dom/xml/CDATASection.h
+++ b/dom/xml/CDATASection.h
@ -43,9 +43,6 @@ public:
  // nsISupports
  NS_DECL_ISUPPORTS_INHERITED

-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  // nsIDOMCharacterData
  NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
--- a/dom/xml/ProcessingInstruction.h
+++ b/dom/xml/ProcessingInstruction.h
@ -25,9 +25,6 @@ public:
  // nsISupports
  NS_DECL_ISUPPORTS_INHERITED

-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  // nsIDOMCharacterData
  NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
--- a/dom/xml/nsXMLElement.h
+++ b/dom/xml/nsXMLElement.h
@ -24,9 +24,6 @@ public:
  // nsISupports
  NS_DECL_ISUPPORTS_INHERITED

-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
  // nsIDOMElement
  NS_FORWARD_NSIDOMELEMENT_TO_GENERIC

--- a/dom/xul/XULDocument.h
+++ b/dom/xul/XULDocument.h
@ -100,9 +100,6 @@ public:
    virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult,
                           bool aPreallocateChildren) const override;

-    // nsIDOMNode interface
-    NS_FORWARD_NSIDOMNODE_TO_NSINODE
-
    // nsIDOMDocument interface
    using nsDocument::CreateElement;
    using nsDocument::CreateElementNS;
--- a/dom/xul/nsXULElement.h
+++ b/dom/xul/nsXULElement.h
@ -394,12 +394,6 @@ public:
                                                int32_t aModType) const override;
    NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override;

-    // nsIDOMNode
-    NS_FORWARD_NSIDOMNODE_TO_NSINODE
-    // And since that shadowed GetParentElement with the XPCOM
-    // signature, pull in the one we care about.
-    using nsStyledElement::GetParentElement;
-
    // nsIDOMElement
    NS_FORWARD_NSIDOMELEMENT_TO_GENERIC