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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2012823003: Move IME related functions from WebFrame to WebLocalFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync Created 4 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: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 9e72f68e2ae62c3332868c6cfd7f90f856fb7cac..eb9faa89e6b43b554e7cac84ff9c469fa9332daf 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2906,9 +2906,12 @@ WebFrame* WebViewImpl::findFrameByName(
return WebLocalFrameImpl::fromFrame(toLocalFrame(frame));
}
-WebFrame* WebViewImpl::focusedFrame()
+WebLocalFrame* WebViewImpl::focusedFrame()
{
- return WebFrame::fromFrame(focusedCoreFrame());
+ Frame* frame = focusedCoreFrame();
+ if (!frame || !frame->isLocalFrame())
dcheng 2016/06/13 17:29:45 Let's just assert that this is local. All the retu
+ return nullptr;
+ return WebLocalFrameImpl::fromFrame(toLocalFrame(frame));
}
void WebViewImpl::setFocusedFrame(WebFrame* frame)

Powered by Google App Engine
This is Rietveld 408576698