components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc - Issue 2574193002: Make subresource filter activation agnostic of in-page navigations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

Issue 2574193002: Make subresource filter activation agnostic of in-page navigations. (Closed)

Patch Set: Final test fix. Created 4 years 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

« no previous file with comments | « chrome/test/data/subresource_filter/frame_with_delayed_script.html ('k') | components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

index e7b47a523771fc1aa624353330e4402bf89600ce..084bdf5fc7ef41e99624f0561452b31f00e77345 100644

--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

@@ -157,7 +157,7 @@ ContentSubresourceFilterDriverFactory::DriverFromFrameHost(

void ContentSubresourceFilterDriverFactory::DidStartNavigation(

content::NavigationHandle* navigation_handle) {

- if (navigation_handle->IsInMainFrame()) {

+ if (navigation_handle->IsInMainFrame() && !navigation_handle->IsSamePage()) {

navigation_chain_.clear();

activation_list_matches_.clear();

navigation_chain_.push_back(navigation_handle->GetURL());

@@ -184,6 +184,7 @@ void ContentSubresourceFilterDriverFactory::RenderFrameDeleted(

void ContentSubresourceFilterDriverFactory::ReadyToCommitNavigation(

content::NavigationHandle* navigation_handle) {

+ DCHECK(!navigation_handle->IsSamePage());

content::RenderFrameHost* render_frame_host =

navigation_handle->GetRenderFrameHost();

GURL url = navigation_handle->GetURL();