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 2062 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()));
-  }
+  if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE)

[yosin_UTC9, 2016/12/07 09:46:00]

Q: What is happened when we call ImeCancelComposition with INPUT_TYPE_NONE?
Q: Why does Blink call this function with INPUT_TYPE_NONE?

[Changwan Ryu, 2016/12/08 01:16:29]

The browser process may ignore it. If it does not ignore it, then it's just an
extra reset that is not needed.
Hmm... Actually this should not happen because there was some composition, but I
encountered some layout test failures. Let me investigate it a bit more.

[Changwan Ryu, 2016/12/08 09:56:07]

Removed this check.

+    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 150 matching lines @@
 blink::WebInputMethodController* RenderWidget::GetInputMethodController()
     const {
   // TODO(ekaramad): Remove this CHECK when GetWebWidget() is
   // always a WebFrameWidget.
   CHECK(GetWebWidget()->isWebFrameWidget());
   return static_cast<blink::WebFrameWidget*>(GetWebWidget())
       ->getActiveWebInputMethodController();
 }
 
 }  // namespace content