Changeset 221029 in webkit

Timestamp:

Aug 22, 2017 11:27:04 AM (7 years ago)

Author:

Chris Dumez

Message:

Clean up PingLoad::processContentExtensionRulesForLoad()
​https://bugs.webkit.org/show_bug.cgi?id=175834

Reviewed by Alex Christensen.

• NetworkProcess/PingLoad.cpp:

(WebKit::PingLoad::willPerformHTTPRedirection):
(WebKit::PingLoad::processContentExtensionRulesForLoad):

• NetworkProcess/PingLoad.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/PingLoad.cpp (modified) (2 diffs)
• NetworkProcess/PingLoad.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-22  Chris Dumez  <cdumez@apple.com>
+
+        Clean up PingLoad::processContentExtensionRulesForLoad()
+        https://bugs.webkit.org/show_bug.cgi?id=175834
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/PingLoad.cpp:
+        (WebKit::PingLoad::willPerformHTTPRedirection):
+        (WebKit::PingLoad::processContentExtensionRulesForLoad):
+        * NetworkProcess/PingLoad.h:
+
 2017-08-22  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/PingLoad.cpp

@@ -112 +112 @@
 
 #if ENABLE(CONTENT_EXTENSIONS)
-    if (processContentExtensionRulesForLoad(request)) {
+    if (processContentExtensionRulesForLoad(request).blockedLoad) {
         RELEASE_LOG_IF_ALLOWED("willPerformHTTPRedirection - Redirect was blocked by content extensions");
         m_lastRedirectionRequest = request;
@@ -322 +322 @@
 }
 
-// Returns true if we should block the load.
-bool PingLoad::processContentExtensionRulesForLoad(ResourceRequest& request)
+ContentExtensions::BlockedStatus PingLoad::processContentExtensionRulesForLoad(ResourceRequest& request)
 {
     auto status = contentExtensionsBackend().processContentExtensionRulesForPingLoad(request.url(), m_parameters.mainDocumentURL);
     applyBlockedStatusToRequest(status, request);
-    return status.blockedLoad;
+    return status;
 }
 

trunk/Source/WebKit/NetworkProcess/PingLoad.h

@@ -72 +72 @@
 #if ENABLE(CONTENT_EXTENSIONS)
     WebCore::ContentExtensions::ContentExtensionsBackend& contentExtensionsBackend();
-    bool processContentExtensionRulesForLoad(WebCore::ResourceRequest&);
+    WebCore::ContentExtensions::BlockedStatus processContentExtensionRulesForLoad(WebCore::ResourceRequest&);
 #endif