Getting rid of frame_size_in_dip in Layer::SetShowSurface

ui/compositor/layer_unittest.cc

Index: ui/compositor/layer_unittest.cc
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 75f29657e53620cc735248da11207cf9495fdbc8..41d6320124ba0e4e318ba45ad18ec1d56baf3fb4 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -1835,7 +1835,7 @@ TEST_F(LayerWithDelegateTest, ExternalContent) {
   before = child->cc_layer_for_testing();
   child->SetShowSurface(cc::SurfaceId(), base::Bind(&FakeSatisfyCallback),
                         base::Bind(&FakeRequireCallback), gfx::Size(10, 10),
-                        1.0, gfx::Size(10, 10));
+                        1.0);
   EXPECT_TRUE(child->cc_layer_for_testing());
   EXPECT_NE(before.get(), child->cc_layer_for_testing());
 
@@ -1856,7 +1856,7 @@ TEST_F(LayerWithDelegateTest, ExternalContentMirroring) {
       cc::FrameSinkId(0, 1),
       cc::LocalFrameId(2, base::UnguessableToken::Create()));
   layer->SetShowSurface(surface_id, satisfy_callback, require_callback,
-                        gfx::Size(10, 10), 1.0f, gfx::Size(10, 10));
+                        gfx::Size(10, 10), 1.0f);
 
   const auto mirror = layer->Mirror();
   auto* const cc_layer = mirror->cc_layer_for_testing();
@@ -1873,7 +1873,7 @@ TEST_F(LayerWithDelegateTest, ExternalContentMirroring) {
       cc::SurfaceId(cc::FrameSinkId(1, 2),
                     cc::LocalFrameId(3, base::UnguessableToken::Create()));
   layer->SetShowSurface(surface_id, satisfy_callback, require_callback,
-                        gfx::Size(20, 20), 2.0f, gfx::Size(20, 20));
+                        gfx::Size(20, 20), 2.0f);

[sadrul, 2016/12/14 05:13:28]

The numbers here don't match: frame-size in the old code is 20x20, whereas in
DIP after this change, it would become 10x10 (since DSF=2). Can you add an
expectation below to make sure the frame-size is correct (after line ~1885, for
example)?

[Saman Sami, 2016/12/14 18:46:05]

It doesn't matter in this test, because it's simply trying to see if the values
are passed correctly to the mirrors, regardless of whether or not they're
consistent. I'm gonna add a new test for checking frame size in dip.

 
   // A new cc::Layer should be created for the mirror.
   EXPECT_NE(cc_layer, mirror->cc_layer_for_testing());
@@ -1901,7 +1901,7 @@ TEST_F(LayerWithDelegateTest, LayerFiltersSurvival) {
   scoped_refptr<cc::Layer> before = layer->cc_layer_for_testing();
   layer->SetShowSurface(cc::SurfaceId(), base::Bind(&FakeSatisfyCallback),
                         base::Bind(&FakeRequireCallback), gfx::Size(10, 10),
-                        1.0, gfx::Size(10, 10));
+                        1.0);
   EXPECT_EQ(layer->layer_grayscale(), 0.5f);
   EXPECT_TRUE(layer->cc_layer_for_testing());
   EXPECT_NE(before.get(), layer->cc_layer_for_testing());
@@ -2224,7 +2224,7 @@ TEST(LayerDelegateTest, DelegatedFrameDamage) {
   layer->set_delegate(&delegate);
   layer->SetShowSurface(cc::SurfaceId(), base::Bind(&FakeSatisfyCallback),
                         base::Bind(&FakeRequireCallback), gfx::Size(10, 10),
-                        1.0, gfx::Size(10, 10));
+                        1.0);
 
   EXPECT_FALSE(delegate.delegated_frame_damage_called());
   layer->OnDelegatedFrameDamage(damage_rect);