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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_win.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
Index: chrome/browser/renderer_host/render_widget_host_view_win.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index cbc97f6bcf633a68002c19e0a5843063b7af1ed8..45251d02575c52ecf19b444dbee04be4afdd0a50 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -237,7 +237,7 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget)
parent_hwnd_(NULL),
is_loading_(false),
overlay_color_(0),
- text_input_type_(WebKit::WebTextInputTypeNone) {
+ text_input_type_(ui::TEXT_INPUT_TYPE_NONE) {
render_widget_host_->set_view(this);
registrar_.Add(this,
NotificationType::RENDERER_PROCESS_TERMINATED,
@@ -587,18 +587,23 @@ void RenderWidgetHostViewWin::SetIsLoading(bool is_loading) {
}
void RenderWidgetHostViewWin::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.
if (text_input_type_ != type) {
text_input_type_ = type;
- if (type == WebKit::WebTextInputTypeText)
+ if (type == ui::TEXT_INPUT_TYPE_TEXT)
ime_input_.EnableIME(m_hWnd);
else
ime_input_.DisableIME(m_hWnd);
}
// Only update caret position if the input method is enabled.
- if (type == WebKit::WebTextInputTypeText)
+ if (type == ui::TEXT_INPUT_TYPE_TEXT)
ime_input_.UpdateCaretRect(m_hWnd, caret_rect);
}
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_win.h ('k') | content/browser/renderer_host/render_widget_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698