Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2519)

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: Added alias for LocalFrame downcast 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 4a1f80bbcee1f567ab855ad9d1193e18b814c748..11949ac7149c637a1536139147cfda56fe6dbb5a 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
@@ -2226,7 +2226,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 (!element || !element->isFrameOwnerElement() || (!element->hasTagName(HTMLNames::iframeTag) && !element->hasTagName(HTMLNames::frameTag)))
return 0;
- return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame());
+ return fromFrame(toLocalFrame(toHTMLFrameOwnerElement(element)->contentFrame()));
}
WebViewImpl* WebFrameImpl::viewImpl() const

Powered by Google App Engine
This is Rietveld 408576698