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

Unified Diff: content/renderer/render_widget.cc

Issue 6990072: The first step for enabling off-the-spot IME on Pepper on ChromeOS/Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a silly mistake lacking an initialization. Created 9 years, 7 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 | « content/renderer/render_widget.h ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 54d787b6cb88688d43ebc400020333a554a7cec4..d9802636c750e853589801c9f52476ec0e71b59b 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1221,13 +1221,11 @@ void RenderWidget::UpdateInputMethod() {
if (!input_method_is_active_)
return;
- WebTextInputType new_type = WebKit::WebTextInputTypeNone;
+ WebTextInputType new_type = GetTextInputType();
WebRect new_caret_bounds;
- if (webwidget_) {
- new_type = webwidget_->textInputType();
- new_caret_bounds = webwidget_->caretOrSelectionBounds();
- }
+ if (webwidget_)
+ new_caret_bounds = webwidget_->caretOrSelectionBounds();
// Only sends text input type and caret bounds to the browser process if they
// are changed.
@@ -1239,6 +1237,12 @@ void RenderWidget::UpdateInputMethod() {
}
}
+WebKit::WebTextInputType RenderWidget::GetTextInputType() {
+ if (webwidget_)
+ return webwidget_->textInputType();
+ return WebKit::WebTextInputTypeNone;
+}
+
WebScreenInfo RenderWidget::screenInfo() {
WebScreenInfo results;
Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
« no previous file with comments | « content/renderer/render_widget.h ('k') | webkit/plugins/ppapi/mock_plugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698