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

Unified Diff: components/subresource_filter/content/common/document_subresource_filter.cc

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: components/subresource_filter/content/common/document_subresource_filter.cc
diff --git a/components/subresource_filter/content/common/document_subresource_filter.cc b/components/subresource_filter/content/common/document_subresource_filter.cc
index af7bbba38742024c69ca64fe1f4e3b5af22696f7..2cf099de0ea00c481c796ba75265a5fc90708425 100644
--- a/components/subresource_filter/content/common/document_subresource_filter.cc
+++ b/components/subresource_filter/content/common/document_subresource_filter.cc
@@ -155,30 +155,29 @@ DocumentSubresourceFilter::DocumentSubresourceFilter(
DocumentSubresourceFilter::~DocumentSubresourceFilter() = default;
-blink::WebDocumentSubresourceFilter::LoadPolicy
-DocumentSubresourceFilter::getLoadPolicy(
+DocumentSubresourceFilter::LoadPolicy DocumentSubresourceFilter::getLoadPolicy(
const blink::WebURL& resourceUrl,
blink::WebURLRequest::RequestContext request_context) {
++statistics_.num_loads_total;
if (activation_state_.filtering_disabled_for_document)
- return Allow;
+ return LoadPolicy::Allow;
if (resourceUrl.protocolIs(url::kDataScheme))
- return Allow;
+ return LoadPolicy::Allow;
// TODO(pkalinnikov): Would be good to avoid converting to GURL.
return EvaluateLoadPolicy(GURL(resourceUrl), ToElementType(request_context));
}
-blink::WebDocumentSubresourceFilter::LoadPolicy
+DocumentSubresourceFilter::LoadPolicy
DocumentSubresourceFilter::GetLoadPolicyForSubdocument(
const GURL& subdocument_url) {
++statistics_.num_loads_total;
if (activation_state_.filtering_disabled_for_document)
- return Allow;
+ return LoadPolicy::Allow;
if (subdocument_url.SchemeIs(url::kDataScheme))
- return Allow;
+ return LoadPolicy::Allow;
return EvaluateLoadPolicy(subdocument_url, proto::ELEMENT_TYPE_SUBDOCUMENT);
}
@@ -188,7 +187,7 @@ void DocumentSubresourceFilter::reportDisallowedLoad() {
std::move(first_disallowed_load_callback_).Run();
}
-blink::WebDocumentSubresourceFilter::LoadPolicy
+DocumentSubresourceFilter::LoadPolicy
DocumentSubresourceFilter::EvaluateLoadPolicy(const GURL& resource_url,
proto::ElementType element_type) {
TRACE_EVENT1("loader", "DocumentSubresourceFilter::EvaluateLoadPolicy", "url",
@@ -217,12 +216,12 @@ DocumentSubresourceFilter::EvaluateLoadPolicy(const GURL& resource_url,
++statistics_.num_loads_matching_rules;
if (activation_state_.activation_level == ActivationLevel::ENABLED) {
++statistics_.num_loads_disallowed;
- return Disallow;
+ return LoadPolicy::Disallow;
} else if (activation_state_.activation_level == ActivationLevel::DRYRUN) {
- return WouldDisallow;
+ return LoadPolicy::WouldDisallow;
}
}
- return Allow;
+ return LoadPolicy::Allow;
}
} // namespace subresource_filter

Powered by Google App Engine
This is Rietveld 408576698