Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / input / touch_selection_controller.h

diff --git a/src/content/browser/renderer_host/input/touch_selection_controller.h b/src/content/browser/renderer_host/input/touch_selection_controller.h
index 13031e1..abe4ed4 100644 (file)
--- a/src/content/browser/renderer_host/input/touch_selection_controller.h
+++ b/src/content/browser/renderer_host/input/touch_selection_controller.h
@@ -31,8 +31,9 @@ class CONTENT_EXPORT TouchSelectionControllerClient {
   virtual bool SupportsAnimation() const = 0;
   virtual void SetNeedsAnimate() = 0;
   virtual void MoveCaret(const gfx::PointF& position) = 0;
-  virtual void SelectBetweenCoordinates(const gfx::PointF& start,
-                                        const gfx::PointF& end) = 0;
+  virtual void MoveRangeSelectionExtent(const gfx::PointF& extent) = 0;
+  virtual void SelectBetweenCoordinates(const gfx::PointF& base,
+                                        const gfx::PointF& extent) = 0;
   virtual void OnSelectionEvent(SelectionEventType event,
                                 const gfx::PointF& position) = 0;
   virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
@@ -44,7 +45,7 @@ class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient {
   TouchSelectionController(TouchSelectionControllerClient* client,
                            base::TimeDelta tap_timeout,
                            float tap_slop);
-  virtual ~TouchSelectionController();
+  ~TouchSelectionController() override;
 
   // To be called when the selection bounds have changed.
   // Note that such updates will trigger handle updates only if preceded
@@ -86,15 +87,15 @@ class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient {
   enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE };
 
   // TouchHandleClient implementation.
-  virtual void OnHandleDragBegin(const TouchHandle& handle) OVERRIDE;
-  virtual void OnHandleDragUpdate(const TouchHandle& handle,
-                                  const gfx::PointF& new_position) OVERRIDE;
-  virtual void OnHandleDragEnd(const TouchHandle& handle) OVERRIDE;
-  virtual void OnHandleTapped(const TouchHandle& handle) OVERRIDE;
-  virtual void SetNeedsAnimate() OVERRIDE;
-  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE;
-  virtual base::TimeDelta GetTapTimeout() const OVERRIDE;
-  virtual float GetTapSlop() const OVERRIDE;
+  void OnHandleDragBegin(const TouchHandle& handle) override;
+  void OnHandleDragUpdate(const TouchHandle& handle,
+                          const gfx::PointF& new_position) override;
+  void OnHandleDragEnd(const TouchHandle& handle) override;
+  void OnHandleTapped(const TouchHandle& handle) override;
+  void SetNeedsAnimate() override;
+  scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
+  base::TimeDelta GetTapTimeout() const override;
+  float GetTapSlop() const override;
 
   void ShowInsertionHandleAutomatically();
   void ShowSelectionHandlesAutomatically();
@@ -133,7 +134,6 @@ class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient {
 
   scoped_ptr<TouchHandle> start_selection_handle_;
   scoped_ptr<TouchHandle> end_selection_handle_;
-  gfx::PointF fixed_handle_position_;
   bool is_selection_active_;
   bool activate_selection_automatically_;