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

content/renderer/render_view_impl.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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1708 matching lines @@
 
 void RenderViewImpl::OnSetName(const std::string& name) {
   if (!webview())
     return;
 
   webview()->mainFrame()->setName(WebString::fromUTF8(name));
 }
 
 void RenderViewImpl::OnSetEditableSelectionOffsets(int start, int end) {
   base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
+  if (!RenderWidget::ShouldHandleImeEvent())
+    return;
   ImeEventGuard guard(this);
   webview()->setEditableSelectionOffsets(start, end);
 }
 
 void RenderViewImpl::OnSetCompositionFromExistingText(
     int start, int end,
     const std::vector<WebKit::WebCompositionUnderline>& underlines) {
-  if (!webview())
+  if (!RenderWidget::ShouldHandleImeEvent())

[aurimas (slooooooooow), 2013/07/09 14:34:03]

Do you need to specify RenderWidget:: even though RenderViewImpl does not
override the call?

[nyquist, 2013/07/12 05:55:24]

Done.

     return;
   ImeEventGuard guard(this);
   webview()->setCompositionFromExistingText(start, end, underlines);
 }
 
 void RenderViewImpl::OnExtendSelectionAndDelete(int before, int after) {
-  if (!webview())
+  if (!RenderWidget::ShouldHandleImeEvent())
     return;
   ImeEventGuard guard(this);
   webview()->extendSelectionAndDelete(before, after);
 }
 
 void RenderViewImpl::OnSetHistoryLengthAndPrune(int history_length,
                                                 int32 minimum_page_id) {
   DCHECK_GE(history_length, 0);
   DCHECK(history_list_offset_ == history_list_length_ - 1);
   DCHECK_GE(minimum_page_id, -1);
@@ skipping 578 matching lines @@
                                            double load_progress) {
   if (load_progress_tracker_ != NULL)
     load_progress_tracker_->DidChangeLoadProgress(frame, load_progress);
 }
 
 void RenderViewImpl::didCancelCompositionOnSelectionChange() {
   Send(new ViewHostMsg_ImeCancelComposition(routing_id()));
 }
 
 void RenderViewImpl::didChangeSelection(bool is_empty_selection) {
-  if (!handling_input_event_ && !handling_select_range_)
+  if (!handling_input_event_ && !handling_select_range_) {
+#if defined(OS_ANDROID)
+    if (!RenderWidget::has_ordered_ime_processing())
+      return;
+#else
     return;
+#endif
+  }
 
   if (is_empty_selection)
     selection_text_.clear();
 
   SyncSelectionIfRequired();
   UpdateTextInputType();
 #if defined(OS_ANDROID)
   UpdateTextInputState(DO_NOT_SHOW_IME);
 #endif
 }
@@ skipping 4457 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content