Source/core/html/HTMLFrameOwnerElement.cpp - Issue 235553006: Move Document pointer from Frame to LocalFrame.

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/html/HTMLFrameOwnerElement.cpp

Issue 235553006: Move Document pointer from Frame to LocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 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:

Index: Source/core/html/HTMLFrameOwnerElement.cpp

diff --git a/Source/core/html/HTMLFrameOwnerElement.cpp b/Source/core/html/HTMLFrameOwnerElement.cpp

index 9b9dccac4d1737f10633440e0a255f202f107452..ee505a784bb9a17e06ac366c3669c7d1234e21b5 100644

--- a/Source/core/html/HTMLFrameOwnerElement.cpp

+++ b/Source/core/html/HTMLFrameOwnerElement.cpp

@@ -152,7 +152,7 @@ HTMLFrameOwnerElement::~HTMLFrameOwnerElement()

Document* HTMLFrameOwnerElement::contentDocument() const

{

- return m_contentFrame ? m_contentFrame->document() : 0;

+ return (m_contentFrame && m_contentFrame->isLocalFrame()) ? toLocalFrame(m_contentFrame)->document() : 0;

}

DOMWindow* HTMLFrameOwnerElement::contentWindow() const