Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Issue 2683413003: Introduce AsyncDocumentSubresourceFilter. (Closed)
Patch Set: Fix fix blink test build. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 607cefdf4231681b31a6de9f5e17c63050659f82..98c1bcb179c029034379ab9a2a47398c715c7554 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -30,6 +30,8 @@
#include "core/loader/FrameFetchContext.h"
+#include <algorithm>
+#include <memory>
#include "bindings/core/v8/ScriptController.h"
#include "bindings/core/v8/V8DOMActivityLogger.h"
#include "core/dom/Document.h"
@@ -78,11 +80,10 @@
#include "platform/weborigin/SecurityPolicy.h"
#include "public/platform/WebCachePolicy.h"
#include "public/platform/WebDocumentSubresourceFilter.h"
+#include "public/platform/WebDocumentSubresourceFilterLoadPolicy.h"
#include "public/platform/WebInsecureRequestPolicy.h"
#include "public/platform/WebViewScheduler.h"
#include "wtf/Vector.h"
-#include <algorithm>
-#include <memory>
namespace blink {
@@ -820,23 +821,23 @@ ResourceRequestBlockedReason FrameFetchContext::canRequestInternal(
DocumentLoader* documentLoader = masterDocumentLoader();
if (documentLoader && documentLoader->subresourceFilter() &&
type != Resource::MainResource && type != Resource::ImportResource) {
- WebDocumentSubresourceFilter::LoadPolicy loadPolicy =
+ WebDocumentSubresourceFilterLoadPolicy loadPolicy =
documentLoader->subresourceFilter()->getLoadPolicy(
url, resourceRequest.requestContext());
if (reportingPolicy == SecurityViolationReportingPolicy::Report) {
switch (loadPolicy) {
- case WebDocumentSubresourceFilter::Allow:
+ case WebDocumentSubresourceFilterLoadPolicy::Allow:
break;
- case WebDocumentSubresourceFilter::Disallow:
+ case WebDocumentSubresourceFilterLoadPolicy::Disallow:
documentLoader->subresourceFilter()->reportDisallowedLoad();
// fall through
- case WebDocumentSubresourceFilter::WouldDisallow:
+ case WebDocumentSubresourceFilterLoadPolicy::WouldDisallow:
documentLoader->didObserveLoadingBehavior(
WebLoadingBehaviorSubresourceFilterMatch);
break;
}
}
- if (loadPolicy == WebDocumentSubresourceFilter::Disallow)
+ if (loadPolicy == WebDocumentSubresourceFilterLoadPolicy::Disallow)
return ResourceRequestBlockedReason::SubresourceFilter;
}

Powered by Google App Engine
This is Rietveld 408576698