Bug 1315601 part 12 - Remove useless retval out param from InsertRuleIntoGroup. r=heycam

MozReview-Commit-ID: Iyj0zLj8nsL

--HG--
extra : rebase_source : 39815c7f1c4ab65b32fa5b41c4231c3e76661628

layout/style/CSSStyleSheet.cpp

@@ -934,8 +934,7 @@ CSSStyleSheet::DeleteRuleFromGroup(css::GroupRule* aGroup, uint32_t aIndex)
 nsresult
 CSSStyleSheet::InsertRuleIntoGroup(const nsAString & aRule,
                                    css::GroupRule* aGroup,
-                                   uint32_t aIndex,
-                                   uint32_t* _retval)
+                                   uint32_t aIndex)
 {
   NS_ASSERTION(mInner->mComplete, "No inserting into an incomplete sheet!");
   // check that the group actually belongs to this sheet!
@@ -993,7 +992,6 @@ CSSStyleSheet::InsertRuleIntoGroup(const nsAString & aRule,
     mDocument->StyleRuleAdded(this, rule);
   }
 
-  *_retval = aIndex;
   return NS_OK;
 }
 

layout/style/CSSStyleSheet.h

@@ -117,7 +117,7 @@ public:
   css::Rule* GetStyleRuleAt(int32_t aIndex) const;
 
   nsresult DeleteRuleFromGroup(css::GroupRule* aGroup, uint32_t aIndex);
-  nsresult InsertRuleIntoGroup(const nsAString& aRule, css::GroupRule* aGroup, uint32_t aIndex, uint32_t* _retval);
+  nsresult InsertRuleIntoGroup(const nsAString& aRule, css::GroupRule* aGroup, uint32_t aIndex);
 
   void SetOwnerRule(css::ImportRule* aOwnerRule) { mOwnerRule = aOwnerRule; /* Not ref counted */ }
   css::ImportRule* GetOwnerRule() const { return mOwnerRule; }

layout/style/GroupRule.cpp

@@ -368,14 +368,13 @@ GroupRule::InsertRule(const nsAString& aRule, uint32_t aIndex, ErrorResult& aRv)
 
   NS_ASSERTION(count <= INT32_MAX, "Too many style rules!");
 
-  uint32_t retval;
   nsresult rv =
-    sheet->AsGecko()->InsertRuleIntoGroup(aRule, this, aIndex, &retval);
+    sheet->AsGecko()->InsertRuleIntoGroup(aRule, this, aIndex);
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return 0;
   }
-  return retval;
+  return aIndex;
 }
 
 nsresult