extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc - Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame.

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/guest_view/guest_view_internal_custom_bindings.cc

Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame. (Closed)

Patch Set: Rebasing... Created 3 years, 6 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 | « extensions/renderer/extension_helper.cc ('k') | extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc

diff --git a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc

index 77440eef9d697bf08d4e6f2522866feebbaa5d77..ddba6ea548e591494c3faa46be905ea96a6d52f4 100644

--- a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc

+++ b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc

@@ -342,14 +342,7 @@ void GuestViewInternalCustomBindings::GetContentWindow(

return;

blink::WebFrame* frame = view->GetWebView()->MainFrame();

- // TODO(lazyboy,nasko): The WebLocalFrame branch is not used when running

- // on top of out-of-process iframes. Remove it once the code is converted.

- v8::Local<v8::Value> window;

- if (frame->IsWebLocalFrame()) {

- window = frame->MainWorldScriptContext()->Global();

- } else {

- window = frame->ToWebRemoteFrame()->GlobalProxy();

- }

+ v8::Local<v8::Value> window = frame->GlobalProxy();

args.GetReturnValue().Set(window);

}