Plumb selection edge points through the compositor

content/browser/renderer_host/input/touch_selection_controller.h

 // Copyright 2014 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_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
 
+#include "cc/output/viewport_selection_bound.h"
 #include "content/browser/renderer_host/input/selection_event_type.h"
 #include "content/browser/renderer_host/input/touch_handle.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace blink {
 class WebInputEvent;
 }
 
@@ skipping 21 matching lines @@
 
 // Controller for manipulating text selection via touch input.
 class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient {
  public:
   explicit TouchSelectionController(TouchSelectionControllerClient* client);
   virtual ~TouchSelectionController();
 
   // To be called when the selection bounds have changed.
   // Note that such updates will trigger handle updates only if preceded
   // by an appropriate call to allow automatic showing.
-  void OnSelectionBoundsChanged(const gfx::RectF& start_rect,
-                                TouchHandleOrientation start_orientation,
-                                bool start_visible,
-                                const gfx::RectF& end_rect,
-                                TouchHandleOrientation end_orientation,
-                                bool end_visible);
+  void OnSelectionBoundsChanged(const cc::ViewportSelectionBound& start,
+                                const cc::ViewportSelectionBound& end);
 
   // Allows touch-dragging of the handle.
   // Returns true iff the event was consumed, in which case the caller should
   // cease further handling of the event.
   bool WillHandleTouchEvent(const ui::MotionEvent& event);
 
   // To be called before forwarding a tap event. This allows automatically
   // showing the insertion handle from subsequent bounds changes.
   void OnTapEvent();
 
@@ skipping 35 matching lines @@
 
   void OnInsertionChanged();
   void OnSelectionChanged();
 
   void ActivateInsertion();
   void DeactivateInsertion();
   void ActivateSelection();
   void DeactivateSelection();
   void ResetCachedValuesIfInactive();
 
-  gfx::PointF GetStartPosition() const;
-  gfx::PointF GetEndPosition() const;
-  float GetStartLineHeight() const;
-  float GetEndLineHeight() const;
+  const gfx::PointF& GetStartPosition() const;
+  const gfx::PointF& GetEndPosition() const;
+  gfx::Vector2dF GetStartLineOffset() const;
+  gfx::Vector2dF GetEndLineOffset() const;
   bool GetStartVisible() const;
   bool GetEndVisible() const;
   TouchHandle::AnimationStyle GetAnimationStyle(bool was_active) const;
 
   TouchSelectionControllerClient* const client_;
 
   InputEventType response_pending_input_event_;
 
-  gfx::RectF start_rect_;
+  cc::ViewportSelectionBound start_;
+  cc::ViewportSelectionBound end_;
   TouchHandleOrientation start_orientation_;
-  bool start_visible_;
-  gfx::RectF end_rect_;
   TouchHandleOrientation end_orientation_;
-  bool end_visible_;
 
   scoped_ptr<TouchHandle> insertion_handle_;
   bool is_insertion_active_;
   bool activate_insertion_automatically_;
 
   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_;
 
   bool selection_empty_;
   bool selection_editable_;
 
   bool temporarily_hidden_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_