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

content/renderer/render_widget.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 181 matching lines @@
   // Close the underlying WebWidget.
   virtual void Close();
 
   // Notifies about a compositor frame commit operation having finished.
   virtual void DidCommitCompositorFrame();
 
   float filtered_time_per_frame() const {
     return filtered_time_per_frame_;
   }
 
-  enum ShowIme {
-    DO_NOT_SHOW_IME,
-    SHOW_IME_IF_NEEDED
-  };
-
   // Handle common setup/teardown for handling IME events.
   void StartHandlingImeEvent();
   void FinishHandlingImeEvent();
 
   virtual void InstrumentWillBeginFrame() {}
   virtual void InstrumentDidBeginFrame() {}
   virtual void InstrumentDidCancelFrame() {}
   virtual void InstrumentWillComposite() {}
 
   virtual bool AllowPartialSwap() const;
@@ skipping 102 matching lines @@
                      const gfx::Size& desired_size);
   void OnRepaint(gfx::Size size_to_paint);
   void OnSmoothScrollCompleted();
   void OnSetTextDirection(WebKit::WebTextDirection direction);
   void OnGetFPS();
   void OnUpdateScreenRects(const gfx::Rect& view_screen_rect,
                            const gfx::Rect& window_screen_rect);
 #if defined(OS_ANDROID)
   void OnImeBatchStateChanged(bool is_begin);
   void OnShowImeIfNeeded();
+
+  // Whenever an IME event that needs an acknowledgement is sent to the browser,
+  // the number of outstanding IME events that needs acknowledgement should be
+  // incremented. All IME events will be dropped until we receive an ack from
+  // the browser.
+  void IncrementOutstandingImeEventAcks();
+
+  // Called by the browser process for every required IME acknowledgement.
+  void OnImeEventAck();
 #endif
+  // Returns whether we currently should handle an IME event.
+  bool ShouldHandleImeEvent();
+
   void OnSnapshot(const gfx::Rect& src_subrect);
   void OnSetBrowserRenderingStats(const BrowserRenderingStats& stats);
 
   // Notify the compositor about a change in viewport size. This should be
   // used only with auto resize mode WebWidgets, as normal WebWidgets should
   // go through OnResize.
   void AutoResizeCompositor();
 
   virtual void SetDeviceScaleFactor(float device_scale_factor);
 
@@ skipping 59 matching lines @@
   bool next_paint_is_restore_ack() const;
   void set_next_paint_is_resize_ack();
   void set_next_paint_is_restore_ack();
   void set_next_paint_is_repaint_ack();
 
   // Checks if the text input state and compose inline mode have been changed.
   // If they are changed, the new value will be sent to the browser process.
   void UpdateTextInputType();
 
 #if defined(OS_ANDROID)
-  // |show_ime_if_needed| should be SHOW_IME_IF_NEEDED iff the update may cause
-  // the ime to be displayed, e.g. after a tap on an input field on mobile.
-  void UpdateTextInputState(ShowIme show_ime);
+  // |show_ime_if_needed| should be true iff the update may cause the ime to be
+  // displayed, e.g. after a tap on an input field on mobile.
+  // |send_ime_ack| should be true iff the browser side is required to
+  // acknowledge the change before the renderer handles any more IME events.
+  // This is when the event did not originate from the browser side IME, such as
+  // changes from JavaScript or autofill.
+  void UpdateTextInputState(bool show_ime_if_needed, bool send_ime_ack);
 #endif
 
   // Checks if the selection bounds have been changed. If they are changed,
   // the new value will be sent to the browser process.
   virtual void UpdateSelectionBounds();
 
   // Override point to obtain that the current input method state and caret
   // position.
   virtual ui::TextInputType GetTextInputType();
   virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end);
@@ skipping 288 matching lines @@
   // The last set of rendering stats received from the browser. This is only
   // received when using the --enable-gpu-benchmarking flag.
   BrowserRenderingStats browser_rendering_stats_;
 
   // The latency information for any current non-accelerated-compositing
   // frame.
   ui::LatencyInfo latency_info_;
 
   uint32 next_output_surface_id_;
 
+#if defined(OS_ANDROID)
+  // A counter for number of outstanding messages from the renderer to the
+  // browser regarding IME-type events that have not been acknowledged by the
+  // browser. If this value is not 0 IME events will be dropped.
+  int outstanding_ime_acks_;
+#endif
+
   base::WeakPtrFactory<RenderWidget> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_