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

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 389 matching lines @@
 
   // When emulated, this returns original device scale factor.
   float GetOriginalDeviceScaleFactor() const;
 
  protected:
   // Friend RefCounted so that the dtor can be non-public. Using this class
   // without ref-counting is an error.
   friend class base::RefCounted<RenderWidget>;
 
   // For unit tests.
+  friend class RenderViewImplTest;
   friend class RenderWidgetTest;
 
   enum ResizeAck {
     SEND_RESIZE_ACK,
     NO_RESIZE_ACK,
   };
 
   RenderWidget(CompositorDependencies* compositor_deps,
                blink::WebPopupType popup_type,
                const ScreenInfo& screen_info,
@@ skipping 57 matching lines @@
   virtual void OnResize(const ResizeParams& params);
   void OnEnableDeviceEmulation(const blink::WebDeviceEmulationParams& params);
   void OnDisableDeviceEmulation();
   void OnChangeResizeRect(const gfx::Rect& resizer_rect);
   virtual void OnWasHidden();
   virtual void OnWasShown(bool needs_repainting,
                           const ui::LatencyInfo& latency_info);
   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();
 
   void OnRepaint(gfx::Size size_to_paint);
   void OnSyntheticGestureCompleted();
   void OnSetTextDirection(blink::WebTextDirection direction);
   void OnGetFPS();
   void OnUpdateScreenRects(const gfx::Rect& view_screen_rect,
                            const gfx::Rect& window_screen_rect);
   void OnUpdateWindowScreenRect(const gfx::Rect& window_screen_rect);
   void OnShowImeIfNeeded();
   void OnSetSurfaceClientId(uint32_t surface_id_namespace);
   void OnHandleCompositorProto(const std::vector<uint8_t>& proto);
 
 #if defined(OS_ANDROID)
   // Called when we send IME event that expects an ACK.
   void OnImeEventSentForAck(const blink::WebTextInputInfo& info);
 
   // Called by the browser process for every required IME acknowledgement.
   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.
   void AutoResizeCompositor();
 
   virtual void OnSetDeviceScaleFactor(float device_scale_factor);
   bool SetDeviceColorProfile(const std::vector<char>& color_profile);
 
   virtual void OnOrientationChange();
 
@@ skipping 273 matching lines @@
   // This reference is set by the RenderFrame and is used to query the IME-
   // related state from the plugin to later send to the browser.
   PepperPluginInstanceImpl* focused_pepper_plugin_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_