Bug 1291390 - Hoist the ParsingMode getter to the superclass and give it a special binary name for WebIDL. r=bholley,r=heycam

In the next patch we want to introduce an accessor called ParsingMode, which conflicts with this one.

dom/webidl/CSSStyleSheet.webidl

@@ -20,7 +20,7 @@ interface CSSStyleSheet : StyleSheet {
   readonly attribute CSSRule? ownerRule;
   [Throws]
   readonly attribute CSSRuleList cssRules;
-  [ChromeOnly]
+  [ChromeOnly, BinaryName="parsingModeDOM"]
   readonly attribute CSSStyleSheetParsingMode parsingMode;
   [Throws]
   unsigned long insertRule(DOMString rule, unsigned long index);

layout/style/CSSStyleSheet.cpp

@@ -1163,22 +1163,6 @@ CSSStyleSheet::~CSSStyleSheet()
   }
 }
 
-mozilla::dom::CSSStyleSheetParsingMode
-CSSStyleSheet::ParsingMode()
-{
-#define CHECK(X, Y) \
-  static_assert(static_cast<int>(X) == static_cast<int>(Y),             \
-                "mozilla::dom::CSSStyleSheetParsingMode and mozilla::css::SheetParsingMode should have identical values");
-
-  CHECK(mozilla::dom::CSSStyleSheetParsingMode::Agent, css::eAgentSheetFeatures);
-  CHECK(mozilla::dom::CSSStyleSheetParsingMode::User, css::eUserSheetFeatures);
-  CHECK(mozilla::dom::CSSStyleSheetParsingMode::Author, css::eAuthorSheetFeatures);
-
-#undef CHECK
-
-  return static_cast<mozilla::dom::CSSStyleSheetParsingMode>(mParsingMode);
-}
-
 void
 CSSStyleSheet::DropRuleCollection()
 {

layout/style/CSSStyleSheet.h

@@ -16,7 +16,6 @@
 #include "mozilla/StyleSheetInfo.h"
 #include "mozilla/css/SheetParsingMode.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/dom/CSSStyleSheetBinding.h"
 
 #include "nscore.h"
 #include "nsCOMPtr.h"
@@ -321,8 +320,6 @@ public:
   void WillDirty();
   void DidDirty();
 
-  mozilla::dom::CSSStyleSheetParsingMode ParsingMode();
-
 private:
   CSSStyleSheet(const CSSStyleSheet& aCopy,
                 CSSStyleSheet* aParentToUse,

layout/style/StyleSheet.cpp

@@ -33,6 +33,22 @@ StyleSheet::StyleSheet(const StyleSheet& aCopy,
 {
 }
 
+mozilla::dom::CSSStyleSheetParsingMode
+StyleSheet::ParsingModeDOM()
+{
+#define CHECK(X, Y) \
+  static_assert(static_cast<int>(X) == static_cast<int>(Y),             \
+                "mozilla::dom::CSSStyleSheetParsingMode and mozilla::css::SheetParsingMode should have identical values");
+
+  CHECK(mozilla::dom::CSSStyleSheetParsingMode::Agent, css::eAgentSheetFeatures);
+  CHECK(mozilla::dom::CSSStyleSheetParsingMode::User, css::eUserSheetFeatures);
+  CHECK(mozilla::dom::CSSStyleSheetParsingMode::Author, css::eAuthorSheetFeatures);
+
+#undef CHECK
+
+  return static_cast<mozilla::dom::CSSStyleSheetParsingMode>(mParsingMode);
+}
+
 bool
 StyleSheet::IsComplete() const
 {

layout/style/StyleSheet.h

@@ -8,6 +8,7 @@
 #define mozilla_StyleSheet_h
 
 #include "mozilla/css/SheetParsingMode.h"
+#include "mozilla/dom/CSSStyleSheetBinding.h"
 #include "mozilla/StyleBackendType.h"
 #include "mozilla/StyleSheetHandle.h"
 #include "mozilla/StyleSheetInfo.h"
@@ -42,6 +43,8 @@ public:
     mParsingMode = aParsingMode;
   }
 
+  mozilla::dom::CSSStyleSheetParsingMode ParsingModeDOM();
+
   nsINode* GetOwnerNode() const { return mOwningNode; }
 
   // The document this style sheet is associated with.  May be null