Source/web/WebFrameImpl.cpp - Issue 219903002: Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..."

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 219903002: Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1917/

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

===================================================================

--- Source/web/WebFrameImpl.cpp (revision 170478)

+++ Source/web/WebFrameImpl.cpp (working copy)

@@ -728,7 +728,7 @@

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

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

return 0;

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

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

}

WebDocument WebFrameImpl::document() const

@@ -1784,7 +1784,7 @@

// 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(toLocalFrame(toHTMLFrameElementBase(element)->contentFrame()));

+ return fromFrame(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 »