Source/web/WebFrameImpl.cpp - Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame.

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/web/WebFrameImpl.cpp

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Missed a null check Created 6 years, 9 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/web/WebFrameImpl.cpp

diff --git a/Source/web/WebFrameImpl.cpp b/Source/web/WebFrameImpl.cpp

index b77f1206377c41769aa70062332ad392838b994e..f5663d58a337c89615e0faa2cb747d99be8f7a46 100644

--- a/Source/web/WebFrameImpl.cpp

+++ b/Source/web/WebFrameImpl.cpp

@@ -760,7 +760,7 @@ WebFrame* WebFrameImpl::findChildByExpression(const WebString& xpath) const

Node* node = xpathResult->iterateNext(IGNORE_EXCEPTION);

if (!node || !node->isFrameOwnerElement())

return 0;

- return fromFrame(toHTMLFrameOwnerElement(node)->contentFrame());

+ return fromFrame(toLocalFrame(toHTMLFrameOwnerElement(node)->contentFrame()));

}

WebDocument WebFrameImpl::document() const

@@ -2278,7 +2278,7 @@ WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element)

// FIXME: Why do we check specifically for <iframe> and <frame> here? Why can't we get the WebFrameImpl from an <object> element, for example.

if (!isHTMLFrameElementBase(element))

return 0;

- return fromFrame(toHTMLFrameElementBase(element)->contentFrame());

+ return fromFrame(toLocalFrame(toHTMLFrameElementBase(element)->contentFrame()));

}

WebViewImpl* WebFrameImpl::viewImpl() const

« no previous file with comments | « Source/web/SpellCheckerClientImpl.cpp ('k') | Source/web/WebPageSerializer.cpp » ('j') | no next file with comments »