Issue #1629 - Part 5: Remove pointless local variables.

Since the local variable is always initialized to false, we don't actually need to declare it and can just pass "false" directly as a parameter to the PrepareSheet function's bool. I was worried about code readability at first, but some well-placed comments took care of that.

1 files changed, 7 insertions, 8 deletions

diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index 1038ff53f..a06dd3737 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -2272,8 +2272,6 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
     state = eSheetComplete;
   } else {
     bool isAlternate;
-    // For now, child sheets are not explicitly enabled.
-    bool isExplicitlyEnabled = false;
     const nsSubstring& empty = EmptyString();
     // For now, use CORS_NONE for child sheets
     rv = CreateSheet(aURL, nullptr, principal,
@@ -2283,8 +2281,9 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
                      parentData ? parentData->mSyncLoad : false,
                      false, empty, state, &isAlternate, &sheet);
     NS_ENSURE_SUCCESS(rv, rv);
-
-    PrepareSheet(sheet, empty, empty, aMedia, nullptr, isAlternate, isExplicitlyEnabled);
+    // For now, child sheets are not explicitly enabled (seventh argument is
+    // always false here). 
+    PrepareSheet(sheet, empty, empty, aMedia, nullptr, isAlternate, false);
   }
 
   rv = InsertChildSheet(sheet, aParentSheet, aParentRule);
@@ -2397,9 +2396,6 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
 
   StyleSheetState state;
   bool isAlternate;
-  // Sheets can only be explicitly enabled after creation and preparation, so
-  // set isExplicitlyEnabled to false.
-  bool isExplicitlyEnabled = false;
   RefPtr<StyleSheet> sheet;
   bool syncLoad = (aObserver == nullptr);
   const nsSubstring& empty = EmptyString();
@@ -2409,7 +2405,10 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
                    false, empty, state, &isAlternate, &sheet);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PrepareSheet(sheet, empty, empty, nullptr, nullptr, isAlternate, isExplicitlyEnabled);
+  // Sheets can only be explicitly enabled after creation and preparation, so
+  // we always pass false for the initial value of the explicitly enabled flag 
+  // when calling PrepareSheet.
+  PrepareSheet(sheet, empty, empty, nullptr, nullptr, isAlternate, false);
 
   if (state == eSheetComplete) {
     LOG(("  Sheet already complete"));