DO NOT SUBMIT: Bundle IME-related messages into one for batch edit

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index ee17345dcec6bcede9f107a1daf89ed473559e8a..c41f80faebc97c4bba56fec41604b0cd6a770354 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -407,6 +407,7 @@ class CONTENT_EXPORT RenderWidget
   friend class base::RefCounted<RenderWidget>;
 
   // For unit tests.
+  friend class RenderViewImplTest;
   friend class RenderWidgetTest;
 
   enum ResizeAck {
@@ -484,15 +485,28 @@ class CONTENT_EXPORT RenderWidget
   void OnCreateVideoAck(int32_t video_id);
   void OnUpdateVideoAck(int32_t video_id);
   void OnRequestMoveAck();
-  virtual void OnImeSetComposition(
+
+  // IME-related methods.
+  void OnImeSetComposition(
       const base::string16& text,
       const std::vector<blink::WebCompositionUnderline>& underlines,
       const gfx::Range& replacement_range,
       int selection_start,
       int selection_end);
-  virtual void OnImeConfirmComposition(const base::string16& text,
-                                       const gfx::Range& replacement_range,
-                                       bool keep_selection);
+  void OnImeConfirmComposition(const base::string16& text,
+                               const gfx::Range& replacement_range,
+                               bool keep_selection);
+  void OnImeExtendSelectionAndDelete(int before, int after);
+  void OnImeSetEditableSelectionOffsets(int start, int end);
+  void OnImeSetCompositionFromExistingText(
+      int start, int end,
+      const std::vector<blink::WebCompositionUnderline>& underlines);
+  void OnImeBatchEdit(const std::vector<IPC::Message>& messages);
+  // Called by the browser process to update the cursor and composition
+  // information.
+  void OnImeRequestCompositionUpdate(bool immediate_request,
+                                     bool monitor_request);
+
   // Called when the device scale factor is changed, or the layer tree is
   // initialized.
   virtual void OnDeviceScaleFactorChanged();
@@ -516,13 +530,9 @@ class CONTENT_EXPORT RenderWidget
   void OnImeEventAck();
 
   // Called by the browser process to update text input state.
-  void OnRequestTextInputStateUpdate();
+  void OnImeRequestTextInputStateUpdate();
 #endif
 
-  // Called by the browser process to update the cursor and composition
-  // information.
-  void OnRequestCompositionUpdate(bool immediate_request, bool monitor_request);
-
   // 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.