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

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

Issue 2183883002: Implement deactivating SubresourceFilter for document. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@integrate_ruleset
Patch Set: Address more comments from engedy@ Created 4 years, 4 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/renderer/document_subresource_filter.cc
diff --git a/components/subresource_filter/content/renderer/document_subresource_filter.cc b/components/subresource_filter/content/renderer/document_subresource_filter.cc
index 7f48ef5f6604400684a84ed58e598239060161ea..a5a94be6b2a2991c6672e5bc606577aae811469a 100644
--- a/components/subresource_filter/content/renderer/document_subresource_filter.cc
+++ b/components/subresource_filter/content/renderer/document_subresource_filter.cc
@@ -75,13 +75,34 @@ proto::ElementType ToElementType(
DocumentSubresourceFilter::DocumentSubresourceFilter(
ActivationState activation_state,
const scoped_refptr<const MemoryMappedRuleset>& ruleset,
- std::vector<GURL> ancestor_document_urls)
+ const std::vector<GURL>& ancestor_document_urls)
: activation_state_(activation_state),
ruleset_(ruleset),
- matcher_(ruleset_->data(), ruleset_->length()),
- ancestor_document_urls_(std::move(ancestor_document_urls)) {
+ ruleset_matcher_(ruleset_->data(), ruleset_->length()) {
DCHECK_NE(activation_state_, ActivationState::DISABLED);
DCHECK(ruleset);
+
+ if (ancestor_document_urls.empty())
+ return;
+
+ document_origin_ = url::Origin(ancestor_document_urls.front());
+
+ url::Origin parent_document_origin;
+ for (auto iter = ancestor_document_urls.rbegin(),
+ rend = ancestor_document_urls.rend();
+ iter != rend; ++iter) {
+ const GURL& document_url(*iter);
+ if (ruleset_matcher_.ShouldDisableFilteringForDocument(
+ document_url, parent_document_origin,
+ proto::ACTIVATION_TYPE_DOCUMENT)) {
+ filtering_disabled_for_document_ = true;
+ return;
+ }
+ parent_document_origin = url::Origin(document_url);
+ }
+
+ // TODO(pkalinnikov): Implement GENERICBLOCK activation type as well.
+ // TODO(pkalinnikov): Match several activation types in a batch.
}
DocumentSubresourceFilter::~DocumentSubresourceFilter() = default;
@@ -92,16 +113,14 @@ bool DocumentSubresourceFilter::allowLoad(
TRACE_EVENT1("loader", "DocumentSubresourceFilter::allowLoad", "url",
resourceUrl.string().utf8());
- // TODO(pkalinnikov): Check all |ancestor_document_urls| for activation bit
- // here or once in the constructor.
+ ++num_loads_total_;
+ if (filtering_disabled_for_document_)
+ return true;
++num_loads_evaluated_;
- url::Origin initiator;
- if (!ancestor_document_urls_.empty())
- initiator = url::Origin(ancestor_document_urls_.front());
-
- if (!matcher_.IsAllowed(GURL(resourceUrl), initiator,
- ToElementType(request_context))) {
+ if (ruleset_matcher_.ShouldDisallowResourceLoad(
+ GURL(resourceUrl), document_origin_,
+ ToElementType(request_context))) {
++num_loads_matching_rules_;
if (activation_state_ == ActivationState::ENABLED) {
++num_loads_disallowed_;

Powered by Google App Engine
This is Rietveld 408576698