Bug 1078674: Add dummy method to nsIDOMNode to preserve FF34 vtable offsets. r=bz -- Re-land with correct bug number DONTBUILD

--HG-- extra : rebase_source : ddd35c35bb5d32e5b5fe68d5dc41eeb31a2ccb26
2014-11-14 10:32:24 +13:00 · 2014-11-14 10:32:24 +13:00 · 8e8ab01583
--- a/dom/base/nsINode.h
+++ b/dom/base/nsINode.h
@ -1984,6 +1984,11 @@ ToCanonicalSupports(nsINode* aPointer)
    aLocalName = nsINode::LocalName(); \
    return NS_OK; \
  } \
+  NS_IMETHOD UnusedPlaceholder(bool* aResult) __VA_ARGS__ \
+  { \
+    *aResult = false; \
+    return NS_OK; \
+  } \
  NS_IMETHOD GetDOMBaseURI(nsAString& aBaseURI) __VA_ARGS__ \
  { \
    nsINode::GetBaseURI(aBaseURI); \
--- a/dom/interfaces/core/nsIDOMAttr.idl
+++ b/dom/interfaces/core/nsIDOMAttr.idl
@ -14,7 +14,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Core/
 */

-[builtinclass, uuid(7d0582bd-09a7-430e-969b-054abbea19fe)]
+[builtinclass, uuid(7db491e8-a3a3-4432-ad67-e6c33e24ac6d)]
 interface nsIDOMAttr : nsIDOMNode
 {
  readonly attribute DOMString            name;
--- a/dom/interfaces/core/nsIDOMCDATASection.idl
+++ b/dom/interfaces/core/nsIDOMCDATASection.idl
@ -15,7 +15,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Core/
 */

-[uuid(4ac42d40-69b7-4506-b730-c41ec74b74bd)]
+[uuid(e14ef131-34cc-40c8-9c99-a403c001184a)]
 interface nsIDOMCDATASection : nsIDOMText
 {
 };
--- a/dom/interfaces/core/nsIDOMCharacterData.idl
+++ b/dom/interfaces/core/nsIDOMCharacterData.idl
@ -13,7 +13,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Core/
 */

-[uuid(844b8e7e-6d37-4fa1-8196-86e3afdfa0ca)]
+[uuid(4109a2d2-e7af-445d-bb72-c7c9b875f35e)]
 interface nsIDOMCharacterData : nsIDOMNode
 {
           attribute DOMString            data;
--- a/dom/interfaces/core/nsIDOMComment.idl
+++ b/dom/interfaces/core/nsIDOMComment.idl
@ -14,7 +14,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Core/
 */

-[uuid(c1a1d2ea-e106-4ee8-806d-2633468e8098)]
+[uuid(e7866ff8-b7fc-494f-87c0-fb017d8a4d30)]
 interface nsIDOMComment : nsIDOMCharacterData
 {
 };
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@ -32,7 +32,7 @@ interface nsIDOMLocation;
 * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
 */

-[uuid(08c6400b-0b6d-4ce6-b88d-e7a15a9c7c03)]
+[uuid(35dc5030-dc83-4291-88a2-0906c549788e)]
 interface nsIDOMDocument : nsIDOMNode
 {
  readonly attribute nsIDOMDocumentType         doctype;
--- a/dom/interfaces/core/nsIDOMDocumentFragment.idl
+++ b/dom/interfaces/core/nsIDOMDocumentFragment.idl
@ -14,7 +14,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Core/
 */

-[builtinclass, uuid(24b34c61-7326-42d4-87ec-5d3b5c0b1b26)]
+[builtinclass, uuid(48eb8d72-95bb-402e-a8fc-f2b187abcbdb)]
 interface nsIDOMDocumentFragment : nsIDOMNode
 {
  /**
--- a/dom/interfaces/core/nsIDOMDocumentType.idl
+++ b/dom/interfaces/core/nsIDOMDocumentType.idl
@ -15,7 +15,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Core/
 */

-[uuid(23c1f549-d40b-49b8-992e-2a1136afa13f)]
+[uuid(cd7467b9-0f26-4787-a359-66e80ba8db92)]
 interface nsIDOMDocumentType : nsIDOMNode
 {
  readonly attribute  DOMString            name;
--- a/dom/interfaces/core/nsIDOMElement.idl
+++ b/dom/interfaces/core/nsIDOMElement.idl
@ -15,7 +15,7 @@ interface nsIDOMMozNamedAttrMap;
 * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
 */

-[uuid(59eb63f9-c8c0-41d2-bf73-739de43b17f9)]
+[uuid(6289999b-1008-4269-b42a-413ec5a9d3f4)]
 interface nsIDOMElement : nsIDOMNode
 {
  readonly attribute DOMString        tagName;
--- a/dom/interfaces/core/nsIDOMNode.idl
+++ b/dom/interfaces/core/nsIDOMNode.idl
@ -16,7 +16,7 @@ interface nsIVariant;
 * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
 */

-[uuid(238222a9-7aa5-4804-9f86-484853ce4b15)]
+[uuid(cc35b412-009b-46a3-9be0-76448f12548d)]
 interface nsIDOMNode : nsISupports
 {
  const unsigned short      ELEMENT_NODE       = 1;
@ -69,6 +69,9 @@ interface nsIDOMNode : nsISupports
  // Introduced in DOM Level 2:
  readonly attribute DOMString        localName;

+  // For vtable compatibility (see bug 1078674)
+  [noscript] bool           unusedPlaceholder();
+
  // Introduced in DOM Level 3:
  // This uses a binaryname to avoid warnings due to name collision with
  // nsINode::GetBaseURI
--- a/dom/interfaces/core/nsIDOMProcessingInstruction.idl
+++ b/dom/interfaces/core/nsIDOMProcessingInstruction.idl
@ -15,7 +15,7 @@
 * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
 */

-[uuid(d0163f44-8f5b-4234-b3aa-43cab64e2039)]
+[uuid(5a139df7-04d0-438d-bd18-d8122564258f)]
 interface nsIDOMProcessingInstruction : nsIDOMCharacterData
 {
  readonly attribute DOMString        target;
--- a/dom/interfaces/core/nsIDOMText.idl
+++ b/dom/interfaces/core/nsIDOMText.idl
@ -13,7 +13,7 @@
 * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
 */

-[uuid(775bbd26-1581-4e54-b82c-5d9dc5a3363b)]
+[uuid(67273994-6aff-4091-9de9-b788a249f783)]
 interface nsIDOMText : nsIDOMCharacterData
 {
  nsIDOMText                      splitText(in unsigned long offset)
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@ -5,7 +5,7 @@

 #include "nsIDOMDocument.idl"

-[uuid(1d54e44a-2012-4567-805d-bd5455fc6421)]
+[uuid(867379ce-165b-4b8c-8582-299b38096aa8)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
  // DOM Level 3 Load & Save, DocumentLS
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@ -13,7 +13,7 @@
 */
 interface nsISelection;

-[uuid(abf369fb-a8b2-4fba-95f5-9e4a896e40a8)]
+[uuid(bd2a0a46-17e4-46ea-9e5d-6a97cf5e3b28)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
           attribute DOMString            domain;
--- a/dom/interfaces/html/nsIDOMHTMLElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLElement.idl
@ -19,7 +19,7 @@ interface nsIDOMHTMLMenuElement;
 * with changes from the work-in-progress WHATWG HTML specification:
 * http://www.whatwg.org/specs/web-apps/current-work/
 */
-[uuid(8c9472c2-785a-40b6-ad47-4d98e64562bd)]
+[uuid(b0c42392-d0e7-4f6a-beb5-a698ce648945)]
 interface nsIDOMHTMLElement : nsIDOMElement
 {
  // metadata attributes
--- a/dom/interfaces/svg/nsIDOMSVGElement.idl
+++ b/dom/interfaces/svg/nsIDOMSVGElement.idl
@ -9,7 +9,7 @@ interface nsIDOMCSSStyleDeclaration;
 interface nsIDOMCSSValue;


-[uuid(6618074e-0c77-4fec-8870-a6f79aa79b07)]
+[uuid(c63517c5-8bab-4cd1-8694-bccafc32a195)]
 interface nsIDOMSVGElement : nsIDOMElement
 {
            // raises DOMException on setting
--- a/dom/interfaces/xul/nsIDOMXULDocument.idl
+++ b/dom/interfaces/xul/nsIDOMXULDocument.idl
@ -10,7 +10,7 @@ interface nsIDOMXULCommandDispatcher;
 interface nsIObserver;
 interface nsIBoxObject;

-[uuid(6f932360-ae43-4fa7-9200-66f64e05a356)]
+[uuid(5d876ab0-5525-4f38-bc3b-f1190e3e3b90)]
 interface nsIDOMXULDocument : nsIDOMDocument
 {
  attribute nsIDOMNode                          popupNode;
--- a/dom/interfaces/xul/nsIDOMXULElement.idl
+++ b/dom/interfaces/xul/nsIDOMXULElement.idl
@ -12,7 +12,7 @@ interface nsIControllers;
 interface nsIBoxObject;


-[uuid(ef62515d-3160-4463-abd7-fc9b7385ecef)]
+[uuid(75435ab3-6863-42a1-ade3-025393d9e80e)]
 interface nsIDOMXULElement : nsIDOMElement
 {
  // Layout properties