Unreviewed, fix -Wmisleading-indentation warning introduced in r246764
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Jul 2019 23:35:49 +0000 (23:35 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Jul 2019 23:35:49 +0000 (23:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=199173
<rdar://problem/45968770>

* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::processContentRuleListsForLoad):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/contentextensions/ContentExtensionsBackend.cpp

index fc5a272..008d69a 100644 (file)
@@ -1,3 +1,12 @@
+2019-07-05  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, fix -Wmisleading-indentation warning introduced in r246764
+        https://bugs.webkit.org/show_bug.cgi?id=199173
+        <rdar://problem/45968770>
+
+        * contentextensions/ContentExtensionsBackend.cpp:
+        (WebCore::ContentExtensions::ContentExtensionsBackend::processContentRuleListsForLoad):
+
 2019-07-05  Timothy Hatcher  <timothy@apple.com>
 
         Mail's use of punchOutWhiteBackgroundsInDarkMode not working on iOS.
index d4d3f34..5067c2d 100644 (file)
@@ -232,7 +232,7 @@ ContentRuleListResults ContentExtensionsBackend::processContentRuleListsForLoad(
             String newProtocol = url.protocolIs("http") ? "https"_s : "wss"_s;
             currentDocument->addConsoleMessage(MessageSource::ContentBlocker, MessageLevel::Info, makeString("Content blocker promoted URL from ", url.string(), " to ", newProtocol));
         }
-        if (results.summary.blockedLoad)
+        if (results.summary.blockedLoad) {
             currentDocument->addConsoleMessage(MessageSource::ContentBlocker, MessageLevel::Info, makeString("Content blocker prevented frame displaying ", mainDocumentURL.string(), " from loading a resource from ", url.string()));
         
             // Quirk for content-blocker interference with Google's anti-flicker optimization (rdar://problem/45968770).
@@ -241,6 +241,7 @@ ContentRuleListResults ContentExtensionsBackend::processContentRuleListsForLoad(
                 if (auto* frame = currentDocument->frame())
                     frame->script().evaluate(ScriptSourceCode { "try { window.dataLayer.hide.end(); console.log('Called window.dataLayer.hide.end() in frame ' + document.URL + ' because the content blocker blocked the load of the https://www.google-analytics.com/analytics.js script'); } catch (e) { }"_s });
             }
+        }
     }
 
     return results;