Move call path for resetInputMethod

content/renderer/render_widget.cc

 // Copyright (c) 2012 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 <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 2004 matching lines @@
     *range = gfx::Range::InvalidRange();
     return;
   }
   range->set_start(web_range.startOffset());
   range->set_end(web_range.endOffset());
 }
 
 bool RenderWidget::ShouldUpdateCompositionInfo(
     const gfx::Range& range,
     const std::vector<gfx::Rect>& bounds) {
+  if (!range.IsValid())
+    return false;
   if (composition_range_ != range)
     return true;
   if (bounds.size() != composition_character_bounds_.size())
     return true;
   for (size_t i = 0; i < bounds.size(); ++i) {
     if (bounds[i] != composition_character_bounds_[i])
       return true;
   }
   return false;
 }
@@ skipping 35 matching lines @@
       web_screen_info.orientationType =
           blink::WebScreenOrientationUndefined;
       break;
   }
   web_screen_info.orientationAngle = screen_info_.orientation_angle;
   return web_screen_info;
 }
 
 void RenderWidget::resetInputMethod() {
   ImeEventGuard guard(this);
-  // If the last text input type is not None, then we should finish any
-  // ongoing composition regardless of the new text input type.
-  if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE) {
-    // If a composition text exists, then we need to let the browser process
-    // to cancel the input method's ongoing composition session.
-    blink::WebInputMethodController* controller = GetInputMethodController();
-    if (controller &&
-        controller->finishComposingText(
-            WebInputMethodController::DoNotKeepSelection))
-      Send(new InputHostMsg_ImeCancelComposition(routing_id()));
-  }
+  Send(new InputHostMsg_ImeCancelComposition(routing_id()));
 
   UpdateCompositionInfo(false /* not an immediate request */);
 }
 
 #if defined(OS_ANDROID)
 void RenderWidget::showUnhandledTapUIIfNeeded(
     const WebPoint& tapped_position,
     const WebNode& tapped_node,
     bool page_changed) {
   DCHECK(input_handler_->handling_input_event());
@@ skipping 148 matching lines @@
     // browser side (https://crbug.com/669219).
     // If there is no WebFrameWidget, then there will be no
     // InputMethodControllers for a WebLocalFrame.
     return nullptr;
   }
   return static_cast<blink::WebFrameWidget*>(GetWebWidget())
       ->getActiveWebInputMethodController();
 }
 
 }  // namespace content