extensions/renderer/script_context.cc - Issue 2184833002: Revert "Fix extension bindings injection for iframes"

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/script_context.cc

Issue 2184833002: Revert "Fix extension bindings injection for iframes" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785

Patch Set: Created 4 years, 5 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

« no previous file with comments | « chrome/test/data/extensions/api_test/bindings/message_sender/public.html ('k') | extensions/renderer/script_context_set.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/script_context.cc

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

index d20d21d77248a9bb3160722f3c10c518f1a4cda0..587087bd1a5e05af173a28c3375f7c346ca4e205 100644

--- a/extensions/renderer/script_context.cc

+++ b/extensions/renderer/script_context.cc

@@ -108,7 +108,7 @@ ScriptContext::ScriptContext(const v8::Local<v8::Context>& v8_context,

effective_context_type_(effective_context_type),

safe_builtins_(this),

isolate_(v8_context->GetIsolate()),

- url_(web_frame_ ? GURL(web_frame_->document().url()) : GURL()),

+ url_(web_frame_ ? GetDataSourceURLForFrame(web_frame_) : GURL()),

runner_(new Runner(this)) {

VLOG(1) << "Created context:\n" << GetDebugString();

gin::PerContextData* gin_data = gin::PerContextData::From(v8_context);