Require ACK for editor-related changes not originating from browser.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 5ac2c12fddebfd4551d6d4c5af4a86d01677e8b4..967bb59f20ce0d30abcc8177e33028eafc96b2d9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1727,6 +1727,8 @@ void RenderViewImpl::OnSetName(const std::string& name) {
 
 void RenderViewImpl::OnSetEditableSelectionOffsets(int start, int end) {
   base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
+  if (!ShouldHandleImeEvent())
+    return;
   ImeEventGuard guard(this);
   webview()->setEditableSelectionOffsets(start, end);
 }
@@ -1734,14 +1736,14 @@ void RenderViewImpl::OnSetEditableSelectionOffsets(int start, int end) {
 void RenderViewImpl::OnSetCompositionFromExistingText(
     int start, int end,
     const std::vector<WebKit::WebCompositionUnderline>& underlines) {
-  if (!webview())
+  if (!ShouldHandleImeEvent())
     return;
   ImeEventGuard guard(this);
   webview()->setCompositionFromExistingText(start, end, underlines);
 }
 
 void RenderViewImpl::OnExtendSelectionAndDelete(int before, int after) {
-  if (!webview())
+  if (!ShouldHandleImeEvent())
     return;
   ImeEventGuard guard(this);
   webview()->extendSelectionAndDelete(before, after);
@@ -2360,7 +2362,7 @@ void RenderViewImpl::didChangeSelection(bool is_empty_selection) {
   SyncSelectionIfRequired();
   UpdateTextInputType();
 #if defined(OS_ANDROID)
-  UpdateTextInputState(DO_NOT_SHOW_IME);
+  UpdateTextInputState(false, true);
 #endif
 }