Bug 1356193 - rename securityFlags local variable for code clarity reasons, r?ckerschb draft
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 13 Apr 2017 11:36:18 +0100
changeset 561982 7c65b4dddffe088deb36ccd72d6bbc6d1fd5a7a4
parent 561911 819a666afddc804b6099ee1b3cff3a0fdf35ec15
child 624145 b5fbeb6245ee5d8bc73e6945a35675db40430844
push id53927
push usergijskruitbosch@gmail.com
push dateThu, 13 Apr 2017 10:36:38 +0000
reviewersckerschb
bugs1356193
milestone55.0a1
Bug 1356193 - rename securityFlags local variable for code clarity reasons, r?ckerschb MozReview-Commit-ID: DmU4ORvXHNY
caps/nsScriptSecurityManager.cpp
--- a/caps/nsScriptSecurityManager.cpp
+++ b/caps/nsScriptSecurityManager.cpp
@@ -343,23 +343,23 @@ nsScriptSecurityManager::GetChannelResul
       nsCOMPtr<nsIPrincipal> principalToInherit = loadInfo->PrincipalToInherit();
       if (!principalToInherit) {
         principalToInherit = loadInfo->TriggeringPrincipal();
       }
       principalToInherit.forget(aPrincipal);
       return NS_OK;
     }
 
-    nsSecurityFlags securityFlags = loadInfo->GetSecurityMode();
+    auto securityMode = loadInfo->GetSecurityMode();
     // The data: inheritance flags should only apply to the initial load,
     // not to loads that it might have redirected to.
     if (loadInfo->RedirectChain().IsEmpty() &&
-        (securityFlags == nsILoadInfo::SEC_REQUIRE_SAME_ORIGIN_DATA_INHERITS ||
-         securityFlags == nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS ||
-         securityFlags == nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS)) {
+        (securityMode == nsILoadInfo::SEC_REQUIRE_SAME_ORIGIN_DATA_INHERITS ||
+         securityMode == nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS ||
+         securityMode == nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS)) {
 
       nsCOMPtr<nsIURI> uri;
       nsresult rv = NS_GetFinalChannelURI(aChannel, getter_AddRefs(uri));
       NS_ENSURE_SUCCESS(rv, rv);
       nsCOMPtr<nsIPrincipal> principalToInherit = loadInfo->PrincipalToInherit();
       if (!principalToInherit) {
         principalToInherit = loadInfo->TriggeringPrincipal();
       }