content/renderer/render_widget.cc - Issue 1995333002: Handle newCursorPosition correctly for Android's commitText()

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/render_widget.cc

Issue 1995333002: Handle newCursorPosition correctly for Android's commitText() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: For aelias@'s 2nd review Created 4 years, 4 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/browser/renderer_host/ime_adapter_android.h ('K') | « content/renderer/render_widget.h ('k') | third_party/WebKit/Source/core/editing/InputMethodController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_widget.cc

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

index cb2afbcc623807384a97bb66e7a6fb376251af6d..d2c1763349989b4591fe3d7a271af002da83f73a 100644

--- a/content/renderer/render_widget.cc

+++ b/content/renderer/render_widget.cc

@@ -1379,11 +1379,12 @@ void RenderWidget::OnImeSetComposition(

void RenderWidget::OnImeConfirmComposition(const base::string16& text,

const gfx::Range& replacement_range,

- bool keep_selection) {

+ bool keep_selection,

+ int relative_cursor_pos) {

#if defined(ENABLE_PLUGINS)

if (focused_pepper_plugin_) {

focused_pepper_plugin_->render_frame()->OnImeConfirmComposition(

- text, replacement_range, keep_selection);

+ text, replacement_range, keep_selection, relative_cursor_pos);

return;

}

#endif

@@ -1397,7 +1398,7 @@ void RenderWidget::OnImeConfirmComposition(const base::string16& text,

ImeEventGuard guard(this);

input_handler_->set_handling_input_event(true);

if (text.length())

- webwidget_->confirmComposition(text);

+ webwidget_->confirmComposition(text, relative_cursor_pos);

else if (keep_selection)

webwidget_->confirmComposition(WebWidget::KeepSelection);

else