Bug 1470420: Fix some minor style inconsistencies I stumbled upon. r?xidorn draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 22 Jun 2018 14:54:32 +0200
changeset 809586 e76cb483492f8a7cd5bf3dc00b8a88fc1e1bf623
parent 809585 fdcdfafb787e92c6543f3c40aa65785d2ce8274b
push id113714
push userbmo:emilio@crisal.io
push dateFri, 22 Jun 2018 13:03:48 +0000
reviewersxidorn
bugs1470420
milestone62.0a1
Bug 1470420: Fix some minor style inconsistencies I stumbled upon. r?xidorn MozReview-Commit-ID: KKnIXoQthdG
layout/style/Loader.cpp
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1332,18 +1332,17 @@ Loader::LoadSheet(SheetLoadData* aLoadDa
     // applying the styles.
     if (aLoadData->mRequestingNode && aLoadData->mLoaderPrincipal) {
       rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(channel),
                                                 aLoadData->mURI,
                                                 aLoadData->mRequestingNode,
                                                 aLoadData->mLoaderPrincipal,
                                                 securityFlags,
                                                 contentPolicyType);
-    }
-    else {
+    } else {
       // either we are loading something inside a document, in which case
       // we should always have a requestingNode, or we are loading something
       // outside a document, in which case the loadingPrincipal and the
       // triggeringPrincipal should always be the systemPrincipal.
       auto result = URLPreloader::ReadURI(aLoadData->mURI);
       if (result.isOk()) {
         nsCOMPtr<nsIInputStream> stream;
         MOZ_TRY(NS_NewCStringInputStream(getter_AddRefs(stream), result.unwrap()));
@@ -1395,18 +1394,17 @@ Loader::LoadSheet(SheetLoadData* aLoadDa
 
   URIPrincipalReferrerPolicyAndCORSModeHashKey key(aLoadData->mURI,
                                      aLoadData->mLoaderPrincipal,
                                      aLoadData->mSheet->GetCORSMode(),
                                      aLoadData->mSheet->GetReferrerPolicy());
   if (aSheetState == eSheetLoading) {
     mSheets->mLoadingDatas.Get(&key, &existingData);
     NS_ASSERTION(existingData, "CreateSheet lied about the state");
-  }
-  else if (aSheetState == eSheetPending){
+  } else if (aSheetState == eSheetPending) {
     mSheets->mPendingDatas.Get(&key, &existingData);
     NS_ASSERTION(existingData, "CreateSheet lied about the state");
   }
 
   if (existingData) {
     LOG(("  Glomming on to existing load"));
     SheetLoadData* data = existingData;
     while (data->mNext) {