third_party/WebKit/Source/web/WebViewImpl.cpp - Issue 2012823003: Move IME related functions from WebFrame to WebLocalFrame

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: 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: remove most of the null checks except the one in spellcheck_provider.cc 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

« chrome/renderer/spellchecker/spellcheck_provider.cc ('K') | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 625d58164ab50d2df97cfe09e8052624b8fe0fc9..c5332b9e025ee191360a8ee40fb475c8b6b8046e 100644

--- a/third_party/WebKit/Source/web/WebViewImpl.cpp

+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp

@@ -2905,9 +2905,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())

+ return nullptr;

+ return WebLocalFrameImpl::fromFrame(toLocalFrame(frame));

}

void WebViewImpl::setFocusedFrame(WebFrame* frame)