Revert of Do not calculate composition bounds until IME requests.

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 332 matching lines @@
   void UpdateSelectionBounds();
 
   virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end);
 
   void OnShowHostContextMenu(ContextMenuParams* params);
 
   // Checks if the composition range or composition character bounds have been
   // changed. If they are changed, the new value will be sent to the browser
   // process. This method does nothing when the browser process is not able to
   // handle composition range and composition character bounds.
-  // If immediate_request is true, render sends the latest composition info to
-  // the browser even if the composition info is not changed.
-  void UpdateCompositionInfo(bool immediate_request);
+  void UpdateCompositionInfo(bool should_update_range);
 
   // Change the device ICC color profile while running a layout test.
   void SetDeviceColorProfileForTesting(const std::vector<char>& color_profile);
   void ResetDeviceColorProfileForTesting();
 
   // Called when the Widget has changed size as a result of an auto-resize.
   void DidAutoResize(const gfx::Size& new_size);
 
   // Called to get the position of the root window containing the widget in
   // screen coordinates.
@@ skipping 121 matching lines @@
   // 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();
 #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 SetDeviceScaleFactor(float device_scale_factor);
   bool SetDeviceColorProfile(const std::vector<char>& color_profile);
 
   virtual void OnOrientationChange();
 
@@ skipping 224 matching lines @@
   // by script etc., not by user input.
   bool text_field_is_dirty_;
 
   // Stores the history of text input infos from the last ACK'ed one from the
   // current one. The size is the number of pending ACKs plus one, since we
   // intentionally keep the last ack'd value to know what the browser is
   // currently aware of.
   std::deque<blink::WebTextInputInfo> text_input_info_history_;
 #endif
 
-  // True if the IME requests updated composition info.
-  bool monitor_composition_info_;
-
   std::unique_ptr<RenderWidgetScreenMetricsEmulator> screen_metrics_emulator_;
 
   // Popups may be displaced when screen metrics emulation is enabled.
   // These values are used to properly adjust popup position.
   gfx::Point popup_view_origin_for_emulation_;
   gfx::Point popup_screen_origin_for_emulation_;
   float popup_origin_scale_for_emulation_;
 
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
   std::unique_ptr<ResizingModeSelector> resizing_mode_selector_;
@@ skipping 32 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_