| 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;
|
| }
|
|
|
|
|