Plumb selection edge points through the compositor

content/browser/renderer_host/input/touch_selection_controller_unittest.cc

 // 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.
 
 #include "content/browser/renderer_host/input/touch_selection_controller.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/mock_motion_event.h"
 
 using ui::test::MockMotionEvent;
@@ skipping 67 matching lines @@
 
   virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE {
     return scoped_ptr<TouchHandleDrawable>(
         new MockTouchHandleDrawable(&dragging_enabled_));
   }
 
   void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; }
   void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; }
 
   void ClearSelection() {
-    controller_->OnSelectionBoundsChanged(gfx::RectF(),
-                                          TOUCH_HANDLE_ORIENTATION_UNDEFINED,
-                                          false,
-                                          gfx::RectF(),
-                                          TOUCH_HANDLE_ORIENTATION_UNDEFINED,
-                                          false);
+    controller_->OnSelectionBoundsChanged(cc::ViewportSelectionBound(),
+                                          cc::ViewportSelectionBound());
   }
 
   void ClearInsertion() { ClearSelection(); }
 
-  void ChangeInsertion(const gfx::RectF& rect,
-                       TouchHandleOrientation orientation,
-                       bool visible) {
-    controller_->OnSelectionBoundsChanged(
-        rect, orientation, visible, rect, orientation, visible);
-  }
-
   void ChangeInsertion(const gfx::RectF& rect, bool visible) {
-    ChangeInsertion(rect, TOUCH_HANDLE_CENTER, visible);
-  }
-
-  void ChangeSelection(const gfx::RectF& start_rect,
-                       TouchHandleOrientation start_orientation,
-                       bool start_visible,
-                       const gfx::RectF& end_rect,
-                       TouchHandleOrientation end_orientation,
-                       bool end_visible) {
-    controller_->OnSelectionBoundsChanged(start_rect,
-                                          start_orientation,
-                                          start_visible,
-                                          end_rect,
-                                          end_orientation,
-                                          end_visible);
+    cc::ViewportSelectionBound bound;
+    bound.type = cc::SELECTION_BOUND_CENTER;
+    bound.edge_top = rect.origin();
+    bound.edge_bottom = rect.bottom_left();
+    bound.visible = visible;
+    controller_->OnSelectionBoundsChanged(bound, bound);
   }
 
   void ChangeSelection(const gfx::RectF& start_rect,
                        bool start_visible,
                        const gfx::RectF& end_rect,
                        bool end_visible) {
-    ChangeSelection(start_rect,
-                    TOUCH_HANDLE_LEFT,
-                    start_visible,
-                    end_rect,
-                    TOUCH_HANDLE_RIGHT,
-                    end_visible);
+    cc::ViewportSelectionBound start_bound, end_bound;
+    start_bound.type = cc::SELECTION_BOUND_LEFT;
+    end_bound.type = cc::SELECTION_BOUND_RIGHT;
+    start_bound.edge_top = start_rect.origin();
+    start_bound.edge_bottom = start_rect.bottom_left();
+    end_bound.edge_top = end_rect.origin();
+    end_bound.edge_bottom = end_rect.bottom_left();
+    start_bound.visible = start_visible;
+    end_bound.visible = end_visible;
+    controller_->OnSelectionBoundsChanged(start_bound, end_bound);
   }
 
   void Animate() {
     base::TimeTicks now = base::TimeTicks::Now();
     while (needs_animate_) {
       needs_animate_ = controller_->Animate(now);
       now += base::TimeDelta::FromMilliseconds(16);
     }
   }
 
@@ skipping 522 matching lines @@
   EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   controller().OnTapEvent();
   ClearSelection();
   EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 }
 
 }  // namespace content