Plumb selection edge points through the compositor

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 6327 matching lines @@
   FakeOutputSurface* fake_output_surface =
       static_cast<FakeOutputSurface*>(host_impl_->output_surface());
   const ViewportSelectionBound& selection_start_before =
       fake_output_surface->last_sent_frame().metadata.selection_start;
   const ViewportSelectionBound& selection_end_before =
       fake_output_surface->last_sent_frame().metadata.selection_end;
   EXPECT_EQ(ViewportSelectionBound(), selection_start_before);
   EXPECT_EQ(ViewportSelectionBound(), selection_end_before);
 
   // Plumb the layer-local selection bounds.
-  gfx::Rect selection_rect(5, 0, 0, 5);
+  gfx::PointF selection_top(5, 0);
+  gfx::PointF selection_bottom(5, 5);
   LayerSelectionBound start, end;
   start.type = SELECTION_BOUND_CENTER;
   start.layer_id = root_layer_id;
-  start.layer_rect = selection_rect;
+  start.edge_bottom = selection_bottom;
+  start.edge_top = selection_top;
   end = start;
   host_impl_->active_tree()->RegisterSelection(start, end);
 
   // Trigger a draw-swap sequence.
   host_impl_->SetNeedsRedraw();
 
   gfx::Rect full_frame_damage(host_impl_->DrawViewportSize());
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
   host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
   host_impl_->DidDrawAllLayers(frame);
   EXPECT_TRUE(host_impl_->SwapBuffers(frame));
 
   // Ensure the selection bounds have propagated to the frame metadata.
   const ViewportSelectionBound& selection_start_after =
       fake_output_surface->last_sent_frame().metadata.selection_start;
   const ViewportSelectionBound& selection_end_after =
       fake_output_surface->last_sent_frame().metadata.selection_end;
   EXPECT_EQ(start.type, selection_start_after.type);
   EXPECT_EQ(end.type, selection_end_after.type);
-  EXPECT_EQ(selection_rect, selection_start_after.viewport_rect);
-  EXPECT_EQ(selection_rect, selection_start_after.viewport_rect);
+  EXPECT_EQ(selection_bottom, selection_start_after.edge_bottom);
+  EXPECT_EQ(selection_top, selection_start_after.edge_top);
   EXPECT_TRUE(selection_start_after.visible);
   EXPECT_TRUE(selection_start_after.visible);
 }
 
 class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
  public:
   SimpleSwapPromiseMonitor(LayerTreeHost* layer_tree_host,
                            LayerTreeHostImpl* layer_tree_host_impl,
                            int* set_needs_commit_count,
                            int* set_needs_redraw_count,
@@ skipping 640 matching lines @@
   host_impl_->DidLoseOutputSurface();
   EXPECT_TRUE(host_impl_->IsContextLost());
   EXPECT_EQ(1, num_lost_surfaces_);
   host_impl_->DidLoseOutputSurface();
   EXPECT_TRUE(host_impl_->IsContextLost());
   EXPECT_EQ(1, num_lost_surfaces_);
 }
 
 }  // namespace
 }  // namespace cc