Bug 1382078 Part 2 - Make nsBindingManager::MediumFeaturesChanged() return bool directly. draft
authorTing-Yu Lin <tlin@mozilla.com>
Wed, 30 Aug 2017 15:22:31 +0800
changeset 658690 788b2b1dc450925f67d259c423fd5057443c138e
parent 658689 0f0eb28d34cbea7e1f5e552a1a91f2eb6d55c36b
child 658691 cf3bf901963a27356b16dcb15dff19cdf26d1e10
push id77838
push userbmo:tlin@mozilla.com
push dateMon, 04 Sep 2017 14:13:04 +0000
bugs1382078
milestone57.0a1
Bug 1382078 Part 2 - Make nsBindingManager::MediumFeaturesChanged() return bool directly. The method always returns NS_OK, and no other caller checks the nsresult. Hence the patch. MozReview-Commit-ID: CnYCZ8VchG
dom/xbl/nsBindingManager.cpp
dom/xbl/nsBindingManager.h
layout/style/nsStyleSet.cpp
--- a/dom/xbl/nsBindingManager.cpp
+++ b/dom/xbl/nsBindingManager.cpp
@@ -735,33 +735,32 @@ nsBindingManager::WalkAllRules(nsIStyleR
     nsIStyleRuleProcessor* ruleProcessor =
       aBinding->PrototypeBinding()->GetRuleProcessor();
     if (ruleProcessor) {
       (*(aFunc))(ruleProcessor, aData);
     }
   });
 }
 
-nsresult
-nsBindingManager::MediumFeaturesChanged(nsPresContext* aPresContext,
-                                        bool* aRulesChanged)
+bool
+nsBindingManager::MediumFeaturesChanged(nsPresContext* aPresContext)
 {
-  *aRulesChanged = false;
+  bool rulesChanged = false;
   RefPtr<nsPresContext> presContext = aPresContext;
 
-  EnumerateBoundContentBindings([=](nsXBLBinding* aBinding) {
+  EnumerateBoundContentBindings([=, &rulesChanged](nsXBLBinding* aBinding) {
     nsIStyleRuleProcessor* ruleProcessor =
       aBinding->PrototypeBinding()->GetRuleProcessor();
     if (ruleProcessor) {
       bool thisChanged = ruleProcessor->MediumFeaturesChanged(presContext);
-      *aRulesChanged = *aRulesChanged || thisChanged;
+      rulesChanged = rulesChanged || thisChanged;
     }
   });
 
-  return NS_OK;
+  return rulesChanged;
 }
 
 void
 nsBindingManager::AppendAllSheets(nsTArray<StyleSheet*>& aArray)
 {
   EnumerateBoundContentBindings([&aArray](nsXBLBinding* aBinding) {
     aBinding->PrototypeBinding()->AppendStyleSheetsTo(aArray);
   });
--- a/dom/xbl/nsBindingManager.h
+++ b/dom/xbl/nsBindingManager.h
@@ -130,18 +130,17 @@ public:
 
   void WalkAllRules(nsIStyleRuleProcessor::EnumFunc aFunc,
                     ElementDependentRuleProcessorData* aData);
   /**
    * Do any processing that needs to happen as a result of a change in
    * the characteristics of the medium, and return whether this rule
    * processor's rules have changed (e.g., because of media queries).
    */
-  nsresult MediumFeaturesChanged(nsPresContext* aPresContext,
-                                 bool* aRulesChanged);
+  bool MediumFeaturesChanged(nsPresContext* aPresContext);
 
   void AppendAllSheets(nsTArray<mozilla::StyleSheet*>& aArray);
 
   void Traverse(nsIContent *aContent,
                             nsCycleCollectionTraversalCallback &cb);
 
   NS_DECL_CYCLE_COLLECTION_CLASS(nsBindingManager)
 
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -2681,18 +2681,18 @@ nsStyleSet::MediumFeaturesChanged(bool a
     stylesChanged = stylesChanged || thisChanged;
   }
   for (nsIStyleRuleProcessor* processor : mScopedDocSheetRuleProcessors) {
     bool thisChanged = processor->MediumFeaturesChanged(presContext);
     stylesChanged = stylesChanged || thisChanged;
   }
 
   if (mBindingManager) {
-    bool thisChanged = false;
-    mBindingManager->MediumFeaturesChanged(presContext, &thisChanged);
+    bool thisChanged =
+      mBindingManager->MediumFeaturesChanged(presContext);
     stylesChanged = stylesChanged || thisChanged;
   }
 
   if (stylesChanged) {
     return eRestyle_Subtree;
   }
   if (aViewportChanged && mUsesViewportUnits) {
     // Rebuild all style data without rerunning selector matching.