Bug 1427512 - Part 8: Remove nsIDOMCSSFontFeatureValuesRule. r=xidorn

MozReview-Commit-ID: FTBV7XxYd4t

dom/interfaces/base/domstubs.idl

@@ -67,7 +67,6 @@ interface nsIDOMCSSPrimitiveValue;
 interface nsIDOMCSSRule;
 interface nsIDOMCSSRuleList;
 interface nsIDOMCSSKeyframeRule;
-interface nsIDOMCSSFontFeatureValuesRule;
 interface nsIDOMCSSStyleSheet;
 interface nsIDOMCSSStyleDeclaration;
 interface nsIDOMCounter;

dom/interfaces/css/moz.build

@@ -9,7 +9,6 @@ with Files("**"):
 
 XPIDL_SOURCES += [
     'nsIDOMCounter.idl',
-    'nsIDOMCSSFontFeatureValuesRule.idl',
     'nsIDOMCSSImportRule.idl',
     'nsIDOMCSSKeyframeRule.idl',
     'nsIDOMCSSKeyframesRule.idl',

dom/interfaces/css/nsIDOMCSSFontFeatureValuesRule.idl

@@ -1,16 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(a343d27f-1da6-4fc3-9355-d4ca434f958e)]
-interface nsIDOMCSSFontFeatureValuesRule : nsISupports
-{
-  attribute DOMString fontFamily;
-                      // raises(DOMException) on setting
-
-  attribute DOMString valueText;
-                      // raises(DOMException) on setting
-};

layout/style/CSSFontFeatureValuesRule.cpp

@@ -10,29 +10,8 @@
 namespace mozilla {
 namespace dom {
 
-NS_IMPL_ADDREF_INHERITED(CSSFontFeatureValuesRule, css::Rule)
-NS_IMPL_RELEASE_INHERITED(CSSFontFeatureValuesRule, css::Rule)
-
-// QueryInterface implementation for CSSFontFeatureValuesRule
 // If this ever gets its own cycle-collection bits, reevaluate our IsCCLeaf
 // implementation.
-NS_INTERFACE_MAP_BEGIN(CSSFontFeatureValuesRule)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFeatureValuesRule)
-NS_INTERFACE_MAP_END_INHERITING(mozilla::css::Rule)
-
-void
-CSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFamily,
-                                              ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
-void
-CSSFontFeatureValuesRule::SetValueText(const nsAString& aFamily,
-                                             ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
 
 bool
 CSSFontFeatureValuesRule::IsCCLeaf() const

layout/style/CSSFontFeatureValuesRule.h

@@ -10,33 +10,27 @@
 #include "mozilla/css/Rule.h"
 
 #include "nsICSSDeclaration.h"
-#include "nsIDOMCSSFontFeatureValuesRule.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 
 namespace mozilla {
 namespace dom {
 
 class CSSFontFeatureValuesRule : public css::Rule
-                               , public nsIDOMCSSFontFeatureValuesRule
 {
 public:
-  NS_DECL_ISUPPORTS_INHERITED
-
   virtual bool IsCCLeaf() const override;
 
   int32_t GetType() const final { return Rule::FONT_FEATURE_VALUES_RULE; }
   using Rule::GetType;
   virtual already_AddRefed<mozilla::css::Rule> Clone() const override = 0;
 
-  using nsIDOMCSSFontFeatureValuesRule::SetFontFamily;
-  using nsIDOMCSSFontFeatureValuesRule::SetValueText;
   // WebIDL interfaces
   uint16_t Type() const final { return nsIDOMCSSRule::FONT_FEATURE_VALUES_RULE; }
   virtual void GetCssTextImpl(nsAString& aCssText) const override = 0;
-  // The XPCOM GetFontFamily is fine
-  void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv);
-  // The XPCOM GetValueText is fine
-  void SetValueText(const nsAString& aFamily, mozilla::ErrorResult& aRv);
+  virtual void GetFontFamily(nsAString& aFamily) = 0;
+  virtual void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv) = 0;
+  virtual void GetValueText(nsAString& aValueText) = 0;
+  virtual void SetValueText(const nsAString& aValueText, mozilla::ErrorResult& aRv) = 0;
 
   virtual size_t
   SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override = 0;

layout/style/ServoFontFeatureValuesRule.cpp

@@ -26,13 +26,6 @@ ServoFontFeatureValuesRule::~ServoFontFeatureValuesRule()
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(ServoFontFeatureValuesRule, CSSFontFeatureValuesRule)
-NS_IMPL_RELEASE_INHERITED(ServoFontFeatureValuesRule, CSSFontFeatureValuesRule)
-
-// QueryInterface implementation for FontFeatureValuesRule
-NS_INTERFACE_MAP_BEGIN(ServoFontFeatureValuesRule)
-NS_INTERFACE_MAP_END_INHERITING(CSSFontFeatureValuesRule)
-
 already_AddRefed<css::Rule>
 ServoFontFeatureValuesRule::Clone() const
 {
@@ -73,30 +66,30 @@ ServoFontFeatureValuesRule::GetCssTextImpl(nsAString& aCssText) const
 
 /* CSSFontFeatureValuesRule implementation */
 
-NS_IMETHODIMP
+void
 ServoFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
 {
   Servo_FontFeatureValuesRule_GetFontFamily(mRawRule, &aFamilyListStr);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 ServoFontFeatureValuesRule::GetValueText(nsAString& aValueText)
 {
   Servo_FontFeatureValuesRule_GetValueText(mRawRule, &aValueText);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-ServoFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily)
+void
+ServoFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily,
+                                          ErrorResult& aRv)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
 }
 
-NS_IMETHODIMP
-ServoFontFeatureValuesRule::SetValueText(const nsAString& aValueText)
+void
+ServoFontFeatureValuesRule::SetValueText(const nsAString& aValueText,
+                                         ErrorResult& aRv)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
 }
 
 } // namespace mozilla

layout/style/ServoFontFeatureValuesRule.h

@@ -20,15 +20,14 @@ public:
   ServoFontFeatureValuesRule(RefPtr<RawServoFontFeatureValuesRule> aRawRule,
                              uint32_t aLine, uint32_t aColumn);
 
-  NS_DECL_ISUPPORTS_INHERITED
-
   RawServoFontFeatureValuesRule* Raw() const { return mRawRule; }
 
-  // nsIDOMCSSFontFeatureValuesRule interface
-  NS_DECL_NSIDOMCSSFONTFEATUREVALUESRULE
-
   // WebIDL interface
   void GetCssTextImpl(nsAString& aCssText) const override;
+  void GetFontFamily(nsAString& aFamily) final;
+  void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv) final;
+  void GetValueText(nsAString& aValueText) final;
+  void SetValueText(const nsAString& aValueText, mozilla::ErrorResult& aRv) final;
 
   // Methods of mozilla::css::Rule
   already_AddRefed<css::Rule> Clone() const final;

layout/style/nsCSSRules.cpp

@@ -655,15 +655,6 @@ nsCSSFontFeatureValuesRule::Clone() const
   return clone.forget();
 }
 
-NS_IMPL_ADDREF_INHERITED(nsCSSFontFeatureValuesRule, dom::CSSFontFeatureValuesRule)
-NS_IMPL_RELEASE_INHERITED(nsCSSFontFeatureValuesRule, dom::CSSFontFeatureValuesRule)
-
-// QueryInterface implementation for nsCSSFontFeatureValuesRule
-// If this ever gets its own cycle-collection bits, reevaluate our IsCCLeaf
-// implementation.
-NS_INTERFACE_MAP_BEGIN(nsCSSFontFeatureValuesRule)
-NS_INTERFACE_MAP_END_INHERITING(dom::CSSFontFeatureValuesRule)
-
 static void
 FeatureValuesToString(
   const nsTArray<gfxFontFeatureValueSet::FeatureValues>& aFeatureValues,
@@ -746,30 +737,30 @@ nsCSSFontFeatureValuesRule::List(FILE* out, int32_t aIndent) const
 }
 #endif
 
-NS_IMETHODIMP
+void
 nsCSSFontFeatureValuesRule::GetFontFamily(nsAString& aFamilyListStr)
 {
   nsStyleUtil::AppendEscapedCSSFontFamilyList(mFamilyList, aFamilyListStr);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+void
 nsCSSFontFeatureValuesRule::GetValueText(nsAString& aValueText)
 {
   FeatureValuesToString(mFeatureValues, aValueText);
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsCSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily)
+void
+nsCSSFontFeatureValuesRule::SetFontFamily(const nsAString& aFontFamily,
+                                          ErrorResult& aRv)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
 }
 
-NS_IMETHODIMP
-nsCSSFontFeatureValuesRule::SetValueText(const nsAString& aValueText)
+void
+nsCSSFontFeatureValuesRule::SetValueText(const nsAString& aValueText,
+                                         ErrorResult& aRv)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
 }
 
 void

layout/style/nsCSSRules.h

@@ -29,7 +29,6 @@
 #include "nsCSSPropertyID.h"
 #include "nsCSSValue.h"
 #include "nsDOMCSSDeclaration.h"
-#include "nsIDOMCSSFontFeatureValuesRule.h"
 #include "nsTArray.h"
 
 class nsMediaList;
@@ -166,18 +165,17 @@ public:
   {
   }
 
-  NS_DECL_ISUPPORTS_INHERITED
-
 #ifdef DEBUG
   void List(FILE* out = stdout, int32_t aIndent = 0) const final;
 #endif
   already_AddRefed<mozilla::css::Rule> Clone() const final;
 
-  // nsIDOMCSSFontFeatureValuesRule interface
-  NS_DECL_NSIDOMCSSFONTFEATUREVALUESRULE
-
   // WebIDL interface
   void GetCssTextImpl(nsAString& aCssText) const final;
+  void GetFontFamily(nsAString& aFamily) final;
+  void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv) final;
+  void GetValueText(nsAString& aValueText) final;
+  void SetValueText(const nsAString& aValueText, mozilla::ErrorResult& aRv) final;
 
   mozilla::SharedFontList* GetFamilyList() const { return mFamilyList; }
   void SetFamilyList(mozilla::SharedFontList* aFamilyList)