extensions/renderer/programmatic_script_injector.cc - Issue 1150683007: [Extensions] Use document url (not top url) for tab-specific permissions

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: extensions/renderer/programmatic_script_injector.cc

Issue 1150683007: [Extensions] Use document url (not top url) for tab-specific permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix extension page content scripts Created 5 years, 7 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

« extensions/renderer/extension_injection_host.h ('K') | « extensions/renderer/programmatic_script_injector.h ('k') | extensions/renderer/script_injection.cc » ('j') | extensions/renderer/script_injection_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/programmatic_script_injector.cc

diff --git a/extensions/renderer/programmatic_script_injector.cc b/extensions/renderer/programmatic_script_injector.cc

index 4546d93d1451beb62fa0b8b4b70454caeb1fae5d..49d87b9d8ebd06ff6443a71379aeb849b392138f 100644

--- a/extensions/renderer/programmatic_script_injector.cc

+++ b/extensions/renderer/programmatic_script_injector.cc

@@ -66,8 +66,7 @@ bool ProgrammaticScriptInjector::ShouldInjectCss(

PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(

const InjectionHost* injection_host,

blink::WebFrame* frame,

- int tab_id,

- const GURL& top_url) const {

+ int tab_id) const {

// It doesn't make sense to inject a script into a remote frame or a frame

// with a null document.

if (frame->isWebRemoteFrame() || frame->document().isNull())

@@ -87,7 +86,7 @@ PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(

DCHECK_EQ(injection_host->id().type(), HostID::EXTENSIONS);

return injection_host->CanExecuteOnFrame(

- effective_document_url, top_url, tab_id, true /* is_declarative */);

+ effective_document_url, frame, tab_id, true /* is_declarative */);

}

std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(