Title: [221029] trunk/Source/WebKit
- Revision
- 221029
- Author
- [email protected]
- Date
- 2017-08-22 11:27:04 -0700 (Tue, 22 Aug 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (221028 => 221029)
--- trunk/Source/WebKit/ChangeLog 2017-08-22 18:19:33 UTC (rev 221028)
+++ trunk/Source/WebKit/ChangeLog 2017-08-22 18:27:04 UTC (rev 221029)
@@ -1,3 +1,15 @@
+2017-08-22 Chris Dumez <[email protected]>
+
+ 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 <[email protected]>
Remove ChromeClient::scrollbarsModeDidChange
Modified: trunk/Source/WebKit/NetworkProcess/PingLoad.cpp (221028 => 221029)
--- trunk/Source/WebKit/NetworkProcess/PingLoad.cpp 2017-08-22 18:19:33 UTC (rev 221028)
+++ trunk/Source/WebKit/NetworkProcess/PingLoad.cpp 2017-08-22 18:27:04 UTC (rev 221029)
@@ -111,7 +111,7 @@
}
#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;
completionHandler({ });
@@ -321,12 +321,11 @@
return *m_contentExtensionsBackend;
}
-// 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;
}
#endif // ENABLE(CONTENT_EXTENSIONS)
Modified: trunk/Source/WebKit/NetworkProcess/PingLoad.h (221028 => 221029)
--- trunk/Source/WebKit/NetworkProcess/PingLoad.h 2017-08-22 18:19:33 UTC (rev 221028)
+++ trunk/Source/WebKit/NetworkProcess/PingLoad.h 2017-08-22 18:27:04 UTC (rev 221029)
@@ -71,7 +71,7 @@
#if ENABLE(CONTENT_EXTENSIONS)
WebCore::ContentExtensions::ContentExtensionsBackend& contentExtensionsBackend();
- bool processContentExtensionRulesForLoad(WebCore::ResourceRequest&);
+ WebCore::ContentExtensions::BlockedStatus processContentExtensionRulesForLoad(WebCore::ResourceRequest&);
#endif
WebCore::SecurityOrigin& securityOrigin() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
