chrome/browser/renderer_host/render_widget_host_view_views.cc - Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux).

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: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: A todo comment is reworded to be more correct. Created 9 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

« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.h ('k') | chrome/browser/renderer_host/render_widget_host_view_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/render_widget_host_view_views.cc

diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc

index b9ebf768e239fcf1454f88401e7ac4b2cc58a862..61a06e40023609360bfc68388f250dce241b8fd8 100644

--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc

+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc

@@ -289,12 +289,16 @@ void RenderWidgetHostViewViews::SetIsLoading(bool is_loading) {

}

void RenderWidgetHostViewViews::ImeUpdateTextInputState(

- WebKit::WebTextInputType type,

+ ui::TextInputType type,

+ bool can_compose_inline,

const gfx::Rect& caret_rect) {

+ // TODO(kinaba): currently, can_compose_inline is ignored and always treated

+ // as true. We need to support "can_compose_inline=false" for PPAPI plugins

+ // that may want to avoid drawing composition-text by themselves and pass

+ // the responsibility to the browser.

DCHECK(GetInputMethod());

- ui::TextInputType new_type = static_cast<ui::TextInputType>(type);

- if (text_input_type_ != new_type) {

- text_input_type_ = new_type;

+ if (text_input_type_ != type) {

+ text_input_type_ = type;

GetInputMethod()->OnTextInputTypeChanged(this);

}

if (caret_bounds_ != caret_rect) {