Replace cc::ViewportSelectionBound with gfx::SelectionBound

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 <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 8252 matching lines @@
   root->SetPosition(gfx::PointF());
   root->SetBounds(gfx::Size(10, 10));
   root->SetDrawsContent(true);
   root->test_properties()->force_render_surface = true;
 
   host_impl_->active_tree()->SetRootLayer(std::move(root));
 
   // Ensure the default frame selection bounds are empty.
   FakeOutputSurface* fake_output_surface =
       static_cast<FakeOutputSurface*>(host_impl_->output_surface());
-  const ViewportSelection& selection_before =
+  const Selection<gfx::SelectionBound>& selection_before =
       fake_output_surface->last_sent_frame().metadata.selection;
-  EXPECT_EQ(ViewportSelectionBound(), selection_before.start);
-  EXPECT_EQ(ViewportSelectionBound(), selection_before.end);
+  EXPECT_EQ(gfx::SelectionBound(), selection_before.start);
+  EXPECT_EQ(gfx::SelectionBound(), selection_before.end);
 
   // Plumb the layer-local selection bounds.
   gfx::Point selection_top(5, 0);
   gfx::Point selection_bottom(5, 5);
   LayerSelection selection;
   selection.start.type = SELECTION_BOUND_CENTER;
   selection.start.layer_id = root_layer_id;
   selection.start.edge_bottom = selection_bottom;
   selection.start.edge_top = selection_top;
   selection.end = selection.start;
   host_impl_->active_tree()->RegisterSelection(selection);
 
   // Trigger a draw-swap sequence.
   host_impl_->SetNeedsRedraw();
 
   gfx::Rect full_frame_damage(host_impl_->DrawViewportSize());
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, PrepareToDrawFrame(&frame));
   host_impl_->DrawLayers(&frame);
   host_impl_->DidDrawAllLayers(frame);
   EXPECT_TRUE(host_impl_->SwapBuffers(frame));
 
   // Ensure the selection bounds have propagated to the frame metadata.
-  const ViewportSelection& selection_after =
+  const Selection<gfx::SelectionBound>& selection_after =
       fake_output_surface->last_sent_frame().metadata.selection;
-  EXPECT_EQ(selection.start.type, selection_after.start.type);
-  EXPECT_EQ(selection.end.type, selection_after.end.type);
-  EXPECT_EQ(gfx::PointF(selection_bottom), selection_after.start.edge_bottom);
-  EXPECT_EQ(gfx::PointF(selection_top), selection_after.start.edge_top);
-  EXPECT_TRUE(selection_after.start.visible);
-  EXPECT_TRUE(selection_after.start.visible);
+  // EXPECT_EQ(selection.start.type(), selection_after.start.type());

[Fady Samuel, 2016/06/03 03:46:53]

What should I do about these types? They're no longer the same :(

[sadrul, 2016/06/03 07:59:21]

Looks like LayerSelectionBound could also be replaced by gfx::SelectionBound?

[Fady Samuel, 2016/06/03 16:25:15]

You're right but that looks like a lot of work. I wanted something more
incremental. Looks like I can just replace the type for now. I'll replace
everything in a subsequent CL.

+  // EXPECT_EQ(selection.end.type(), selection_after.end.type());
+  EXPECT_EQ(gfx::PointF(selection_bottom), selection_after.start.edge_bottom());
+  EXPECT_EQ(gfx::PointF(selection_top), selection_after.start.edge_top());
+  EXPECT_TRUE(selection_after.start.visible());
+  EXPECT_TRUE(selection_after.start.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,
                            int* forward_to_main_count)
       : SwapPromiseMonitor(layer_tree_host, layer_tree_host_impl),
@@ skipping 2441 matching lines @@
 
   // Re-initialize with a software output surface.
   output_surface_ = FakeOutputSurface::CreateSoftware(
       base::WrapUnique(new SoftwareOutputDevice));
   host_impl_->InitializeRenderer(output_surface_.get());
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
 }
 
 }  // namespace
 }  // namespace cc