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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221029
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+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>
Remove ChromeClient::scrollbarsModeDidChange
}
#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({ });
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)
#if ENABLE(CONTENT_EXTENSIONS)
WebCore::ContentExtensions::ContentExtensionsBackend& contentExtensionsBackend();
- bool processContentExtensionRulesForLoad(WebCore::ResourceRequest&);
+ WebCore::ContentExtensions::BlockedStatus processContentExtensionRulesForLoad(WebCore::ResourceRequest&);
#endif
WebCore::SecurityOrigin& securityOrigin() const;