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

content/browser/renderer_host/render_widget_host_view_android.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/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 55 matching lines @@
   if (!return_mailbox.IsZero()) {
     ack.gl_frame_data->mailbox = return_mailbox;
     ack.gl_frame_data->size = return_size;
     ack.gl_frame_data->sync_point =
         ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint();
   }
   RenderWidgetHostImpl::SendSwapCompositorFrameAck(
       route_id, renderer_host_id, ack);
 }
 
+// Sends an acknowledgement to the renderer of a processed IME event.
+void SendAcknowledgeImeEvent(RenderWidgetHostImpl* host) {
+  host->Send(new ViewMsg_AcknowledgeImeEvent(host->GetRoutingID()));
+}
+
 }  // anonymous namespace
 
 RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
     RenderWidgetHostImpl* widget_host,
     ContentViewCoreImpl* content_view_core)
     : host_(widget_host),
       needs_begin_frame_(false),
       are_layers_attached_(true),
       content_view_core_(NULL),
       ime_adapter_android_(this),
+      strict_ime_processing_(false),
       cached_background_color_(SK_ColorWHITE),
       texture_id_in_layer_(0),
       weak_ptr_factory_(this),
       overscroll_effect_enabled_(true) {
   if (CompositorImpl::UsesDirectGL()) {
     surface_texture_transport_.reset(new SurfaceTextureTransportClient());
     layer_ = surface_texture_transport_->Initialize();
     layer_->SetIsDrawable(true);
   } else {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 11 matching lines @@
   overscroll_effect_enabled_ = !CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableOverscrollEdgeEffect);
   // Don't block the main thread with effect resource loading.
   // Actual effect creation is deferred until an overscroll event is received.
   if (overscroll_effect_enabled_) {
     base::WorkerPool::PostTask(FROM_HERE,
                                base::Bind(&OverscrollGlow::EnsureResources),
                                true);
   }
 
+  strict_ime_processing_ =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableStrictImeProcessing);
+
   host_->SetView(this);
   SetContentViewCore(content_view_core);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   SetContentViewCore(NULL);
   DCHECK(ack_callbacks_.empty());
   if (texture_id_in_layer_) {
     ImageTransportFactoryAndroid::GetInstance()->DeleteTexture(
         texture_id_in_layer_);
@@ skipping 256 matching lines @@
     bool can_compose_inline) {
   // Unused on Android, which uses OnTextInputChanged instead.
 }
 
 int RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
   return reinterpret_cast<int>(&ime_adapter_android_);
 }
 
 void RenderWidgetHostViewAndroid::OnTextInputStateChanged(
     const ViewHostMsg_TextInputState_Params& params) {
+  if (has_strict_ime_processing()) {
+    // Regardless of how we exit from this method, we must acknowledge that we
+    // processed the input state change.
+    base::ScopedClosureRunner ackCaller(
+        base::Bind(&SendAcknowledgeImeEvent, host_));
+  }
   if (!IsShowing())
     return;
 
   content_view_core_->UpdateImeAdapter(
       GetNativeImeAdapter(),
       static_cast<int>(params.type),
       params.value, params.selection_start, params.selection_end,
       params.composition_start, params.composition_end,
       params.show_ime_if_needed);
 }
@@ skipping 711 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content