Bug 1420039 - Return a ServoStyleSheet from GroupRuleRuleList::GetParentObject when the rule is Servo-backed. r?xidorn draft
authorCameron McCormack <cam@mcc.id.au>
Thu, 23 Nov 2017 13:06:58 +0800
changeset 702401 0d46a52e2b70d29dfc1fe19522d19124ebd21b38
parent 702393 0eac98e20dadb902aab1c6a145d7e39339446ed1
child 702411 028dc14e8c02e659e717972f86738196c59648fd
push id90476
push userbmo:cam@mcc.id.au
push dateThu, 23 Nov 2017 05:30:49 +0000
reviewersxidorn
bugs1420039
milestone59.0a1
Bug 1420039 - Return a ServoStyleSheet from GroupRuleRuleList::GetParentObject when the rule is Servo-backed. r?xidorn MozReview-Commit-ID: JSROw6Ml9TY
layout/style/GroupRule.cpp
--- a/layout/style/GroupRule.cpp
+++ b/layout/style/GroupRule.cpp
@@ -27,17 +27,17 @@ namespace css {
 // Style Rule List for group rules
 //
 
 class GroupRuleRuleList final : public dom::CSSRuleList
 {
 public:
   explicit GroupRuleRuleList(GroupRule *aGroupRule);
 
-  virtual CSSStyleSheet* GetParentObject() override;
+  StyleSheet* GetParentObject() override;
 
   virtual Rule*
   IndexedGetter(uint32_t aIndex, bool& aFound) override;
   virtual uint32_t
   Length() override;
 
   void DropReference() { mGroupRule = nullptr; }
 
@@ -54,24 +54,23 @@ GroupRuleRuleList::GroupRuleRuleList(Gro
   // The rule will tell us when its going away.
   mGroupRule = aGroupRule;
 }
 
 GroupRuleRuleList::~GroupRuleRuleList()
 {
 }
 
-CSSStyleSheet*
+StyleSheet*
 GroupRuleRuleList::GetParentObject()
 {
   if (!mGroupRule) {
     return nullptr;
   }
-  StyleSheet* sheet = mGroupRule->GetStyleSheet();
-  return sheet ? sheet->AsGecko() : nullptr;
+  return mGroupRule->GetStyleSheet();
 }
 
 uint32_t
 GroupRuleRuleList::Length()
 {
   if (!mGroupRule) {
     return 0;
   }