Never submit: tentative Pepper IME.

content/renderer/render_widget.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_widget.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1266 matching lines @@
 }
 
 void RenderWidget::set_next_paint_is_repaint_ack() {
   next_paint_flags_ |= ViewHostMsg_UpdateRect_Flags::IS_REPAINT_ACK;
 }
 
 void RenderWidget::UpdateInputMethod() {
   if (!input_method_is_active_)
     return;
 
-  ui::TextInputType new_type = GetTextInputType();
+  int type = GetTextInputType();
+  // Check the type is in the range representable by ui::TextInputType.
+  DCHECK(type <= ui::TEXT_INPUT_TYPE_URL) <<
+    "WebKit::WebTextInputType and ui::TextInputType not synchronized";
+  ui::TextInputType new_type = static_cast<ui::TextInputType>(type);
   bool new_can_compose_inline = CanComposeInline();
-  WebRect new_caret_bounds;
-
-  if (webwidget_)
-   new_caret_bounds = webwidget_->caretOrSelectionBounds();
+  WebRect new_caret_bounds = GetCaretBounds();
 
   // Only sends text input type and caret bounds to the browser process if they
   // are changed.
   if (text_input_type_ != new_type || caret_bounds_ != new_caret_bounds ||
       can_compose_inline_ != new_can_compose_inline) {
     text_input_type_ = new_type;
     can_compose_inline_ = new_can_compose_inline;
     caret_bounds_ = new_caret_bounds;
     Send(new ViewHostMsg_ImeUpdateTextInputState(
         routing_id(), new_type, new_can_compose_inline, new_caret_bounds));
@@ skipping 10 matching lines @@
                int(ui::TEXT_INPUT_TYPE_SEARCH), mismatching_enums);
 COMPILE_ASSERT(int(WebKit::WebTextInputTypeEmail) == \
                int(ui::TEXT_INPUT_TYPE_EMAIL), mismatching_enums);
 COMPILE_ASSERT(int(WebKit::WebTextInputTypeNumber) == \
                int(ui::TEXT_INPUT_TYPE_NUMBER), mismatching_enums);
 COMPILE_ASSERT(int(WebKit::WebTextInputTypeTelephone) == \
                int(ui::TEXT_INPUT_TYPE_TELEPHONE), mismatching_enums);
 COMPILE_ASSERT(int(WebKit::WebTextInputTypeURL) == \
                int(ui::TEXT_INPUT_TYPE_URL), mismatching_enums);
 
-ui::TextInputType RenderWidget::GetTextInputType() {
-  if (webwidget_) {
-    int type = webwidget_->textInputType();
-    // Check the type is in the range representable by ui::TextInputType.
-    DCHECK(type <= ui::TEXT_INPUT_TYPE_URL) <<
-      "WebKit::WebTextInputType and ui::TextInputType not synchronized";
-    return static_cast<ui::TextInputType>(type);
-  }
-  return ui::TEXT_INPUT_TYPE_NONE;
+WebRect RenderWidget::GetCaretBounds() {
+  if (!webwidget_)
+    return WebRect();
+  return webwidget_->caretOrSelectionBounds();
+}
+
+WebKit::WebTextInputType RenderWidget::GetTextInputType() {
+  if (!webwidget_)
+    return WebKit::WebTextInputTypeNone;
+  return webwidget_->textInputType();
 }
 
 bool RenderWidget::CanComposeInline() {
   return true;
 }
 
 WebScreenInfo RenderWidget::screenInfo() {
   WebScreenInfo results;
   Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
   return results;
@@ skipping 42 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }