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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 338993003: Cleanup various WebView/WebFrame APIs to properly handle remote frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Throw in a call to relaxAdoptionRequirement Created 6 years, 6 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/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index c12b34326755f4c749bdbf89cd9d4c9c6ca70930..74abeff0172446b09e0b63394f761a32f4bee950 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -2492,9 +2492,7 @@ void WebViewImpl::setPageEncoding(const WebString& encodingName)
WebFrame* WebViewImpl::mainFrame()
{
- // FIXME: This should be updated so it can return both WebLocalFrames and
- // WebRemoteFrames. Right now, it only returns WebLocalFrames.
- return mainFrameImpl();
+ return WebFrame::fromFrame(m_page ? m_page->mainFrame() : 0);
}
WebFrame* WebViewImpl::findFrameByName(

Powered by Google App Engine
This is Rietveld 408576698