extensions/renderer/script_context.cc - Issue 444503002: Start using RenderFrameProxyHost objects.

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 444503002: Start using RenderFrameProxyHost objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Create view IFF frame is main frame Created 6 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:

Index: extensions/renderer/script_context.cc

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

index 0f7a77c553f2916de8e59914f6aa3c4e8730a2ea..20109a41fef5b126ef73b70e40a74f60835809d0 100644

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

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

@@ -188,10 +188,10 @@ GURL ScriptContext::GetEffectiveDocumentURL(const blink::WebFrame* frame,

const blink::WebFrame* parent = frame;

do {

parent = parent->parent() ? parent->parent() : parent->opener();

- } while (parent != NULL &&

+ } while (parent != NULL && !parent->document().isNull() &&

GURL(parent->document().url()).SchemeIs(url::kAboutScheme));

- if (parent) {

+ if (parent && !parent->document().isNull()) {

// Only return the parent URL if the frame can access it.

const blink::WebDocument& parent_document = parent->document();

if (frame->document().securityOrigin().canAccess(

« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »