Source/core/frame/LocalDOMWindow.cpp - Issue 1112843007: Fix frameElement for frames with a remote parent.

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: Source/core/frame/LocalDOMWindow.cpp

Issue 1112843007: Fix frameElement for frames with a remote parent. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add comment about doing the access check on the frame vs node. Created 5 years, 8 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

Index: Source/core/frame/LocalDOMWindow.cpp

diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp

index fcbedc571a32e4330605e33fe2ac5c88734d7b2e..d9d281ff781333e877a0659c825adaa1fb94ca22 100644

--- a/Source/core/frame/LocalDOMWindow.cpp

+++ b/Source/core/frame/LocalDOMWindow.cpp

@@ -737,8 +737,7 @@ Element* LocalDOMWindow::frameElement() const

return nullptr;

// The bindings security check should ensure we're same origin...

- ASSERT(!frame()->owner() || frame()->owner()->isLocal());

- return frame()->deprecatedLocalOwner();

+ return toHTMLFrameOwnerElement(frame()->owner());

}

void LocalDOMWindow::focus(ExecutionContext* context)

« no previous file with comments | « Source/bindings/core/v8/custom/V8WindowCustom.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »