content/renderer/text_input_client_observer.cc - 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: content/renderer/text_input_client_observer.cc

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

« content/renderer/render_view_impl.cc ('K') | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp » ('j') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/text_input_client_observer.cc

diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc

index 3c953eebaad238155ab72433c28dbed90b5422e2..fa8aba51cca07a7373add15e3b6262ae725891cd 100644

--- a/content/renderer/text_input_client_observer.cc

+++ b/content/renderer/text_input_client_observer.cc

@@ -87,7 +87,7 @@ void TextInputClientObserver::OnFirstRectForCharacterRange(gfx::Range range) {

} else

#endif

{

- blink::WebFrame* frame = webview()->focusedFrame();

+ blink::WebLocalFrame* frame = webview()->focusedFrame();

dcheng 2016/06/13 17:29:45 Same questions in this file about null |frame|.

if (frame) {

blink::WebRect web_rect;

frame->firstRectForCharacterRange(range.start(), range.length(),

@@ -102,7 +102,7 @@ void TextInputClientObserver::OnStringForRange(gfx::Range range) {

#if defined(OS_MACOSX)

blink::WebPoint baselinePoint;

NSAttributedString* string = nil;

- blink::WebLocalFrame* frame = webview()->focusedFrame()->toWebLocalFrame();

+ blink::WebLocalFrame* frame = webview()->focusedFrame();

if (frame) {

string = blink::WebSubstringUtil::attributedSubstringInRange(

frame, range.start(), range.length(), &baselinePoint);