Clean up names and remove unnecessary parameter

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 4c0fda13bb72976e3dd52db55248cf0bf05495d2..3eb5eabbe5b63dc881ed69c306442950c86bf537 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -925,7 +925,7 @@ void RenderWidget::WillBeginCompositorFrame() {
   // The UpdateTextInputState can result in further layout and possibly
   // enable GPU acceleration so they need to be called before any painting
   // is done.
-  UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_NON_IME);
+  UpdateTextInputState(ShowIme::DO_NOT_SHOW);
   UpdateSelectionBounds();
 
   for (auto& observer : render_frame_proxies_)
@@ -1017,10 +1017,16 @@ void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) {
   DCHECK(!input_handler_);
 }
 
-void RenderWidget::UpdateTextInputState(ShowIme show_ime,
-                                        ChangeSource change_source) {
+void RenderWidget::UpdateTextInputState(ShowIme show_ime) {
+  UpdateTextInputStateInternal(show_ime, false);
+}
+
+void RenderWidget::UpdateTextInputStateInternal(ShowIme show_ime,
+                                                bool reply_to_request) {
   TRACE_EVENT0("renderer", "RenderWidget::UpdateTextInputState");
+
   if (ime_event_guard_) {
+    DCHECK(!reply_to_request);
     // show_ime should still be effective even if it was set inside the IME
     // event guard.
     if (show_ime == ShowIme::IF_NEEDED) {
@@ -1043,8 +1049,7 @@ void RenderWidget::UpdateTextInputState(ShowIme show_ime,
 
   // Only sends text input params if they are changed or if the ime should be
   // shown.
-  if (show_ime == ShowIme::IF_NEEDED ||
-      change_source == ChangeSource::FROM_IME ||
+  if (show_ime == ShowIme::IF_NEEDED || reply_to_request ||
       text_input_type_ != new_type || text_input_mode_ != new_mode ||
       text_input_info_ != new_info ||
       can_compose_inline_ != new_can_compose_inline) {
@@ -1059,9 +1064,7 @@ void RenderWidget::UpdateTextInputState(ShowIme show_ime,
     params.composition_end = new_info.compositionEnd;
     params.can_compose_inline = new_can_compose_inline;
     params.show_ime_if_needed = (show_ime == ShowIme::IF_NEEDED);
-#if defined(OS_ANDROID) || defined(USE_AURA)
-    params.is_non_ime_change = (change_source == ChangeSource::FROM_NON_IME);
-#endif
+    params.reply_to_request = reply_to_request;
     Send(new ViewHostMsg_TextInputStateChanged(routing_id(), params));
 
     text_input_info_ = new_info;
@@ -1713,9 +1716,7 @@ void RenderWidget::OnDragSourceSystemDragEnded() {
 }
 
 void RenderWidget::showImeIfNeeded() {
-#if defined(OS_ANDROID) || defined(USE_AURA)
-  UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME);
-#endif
+  UpdateTextInputState(ShowIme::IF_NEEDED);
 
 // TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with
 // virtual keyboard.
@@ -1787,7 +1788,8 @@ void RenderWidget::convertWindowToViewport(blink::WebFloatRect* rect) {
 void RenderWidget::OnRequestTextInputStateUpdate() {
   DCHECK(!ime_event_guard_);
   UpdateSelectionBounds();
-  UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_IME);
+  UpdateTextInputStateInternal(ShowIme::DO_NOT_SHOW,
+                               true /* reply_to_request */);
 }
 #endif
 
@@ -1874,15 +1876,7 @@ void RenderWidget::OnImeEventGuardStart(ImeEventGuard* guard) {
 
 void RenderWidget::OnImeEventGuardFinish(ImeEventGuard* guard) {
   if (ime_event_guard_ != guard) {
-#if defined(OS_ANDROID)
-    // In case a from-IME event (e.g. touch) ends up in not-from-IME event
-    // (e.g. long press gesture), we want to treat it as not-from-IME event
-    // so that ReplicaInputConnection can make changes to its Editable model.
-    // Therefore, we want to mark this text state update as 'from IME' only
-    // when all the nested events are all originating from IME.
-    ime_event_guard_->set_from_ime(
-        ime_event_guard_->from_ime() && guard->from_ime());
-#endif
+    DCHECK(!ime_event_guard_->reply_to_request());
     return;
   }
   ime_event_guard_ = nullptr;
@@ -1892,9 +1886,8 @@ void RenderWidget::OnImeEventGuardFinish(ImeEventGuard* guard) {
   // ime event.
   UpdateSelectionBounds();
 #if defined(OS_ANDROID)
-  UpdateTextInputState(
-      guard->show_ime() ? ShowIme::IF_NEEDED : ShowIme::HIDE_IME,
-      guard->from_ime() ? ChangeSource::FROM_IME : ChangeSource::FROM_NON_IME);
+  UpdateTextInputState(guard->show_ime() ? ShowIme::IF_NEEDED
+                                         : ShowIme::DO_NOT_SHOW);
 #endif
 }
 
@@ -2108,13 +2101,13 @@ void RenderWidget::didHandleGestureEvent(
   if (event_cancelled)
     return;
   if (event.type == WebInputEvent::GestureTap) {
-    UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME);
+    UpdateTextInputState(ShowIme::IF_NEEDED);
   } else if (event.type == WebInputEvent::GestureLongPress) {
     DCHECK(GetWebWidget());
     if (GetWebWidget()->textInputInfo().value.isEmpty())
-      UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_NON_IME);
+      UpdateTextInputState(ShowIme::DO_NOT_SHOW);
     else
-      UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME);
+      UpdateTextInputState(ShowIme::IF_NEEDED);
   }
 // TODO(ananta): Piggyback off existing IPCs to communicate this information,
 // crbug/420130.