Explicitly specify contents scale for SurfaceLayer.

cc/layers/surface_layer_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 "base/message_loop/message_loop_proxy.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
@@ skipping 47 matching lines @@
 // Check that one surface can be referenced by multiple LayerTreeHosts, and
 // each will create its own SurfaceSequence that's satisfied on destruction.
 TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   SurfaceSequence blank_change;  // Receives sequence if commit doesn't happen.
 
   SurfaceId required_id;
   std::set<SurfaceSequence> required_seq;
   scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
-  layer->SetSurfaceId(SurfaceId(1), gfx::Size(1, 1));
+  layer->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
   layer_tree_host_->set_surface_id_namespace(1);
   layer_tree_host_->SetRootLayer(layer);
 
   scoped_ptr<FakeLayerTreeHost> layer_tree_host2 =
       FakeLayerTreeHost::Create(&fake_client_);
   scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
-  layer2->SetSurfaceId(SurfaceId(1), gfx::Size(1, 1));
+  layer2->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
   layer_tree_host2->set_surface_id_namespace(2);
   layer_tree_host2->SetRootLayer(layer2);
 
   // Layers haven't been removed, so no sequence should be satisfied.
   EXPECT_TRUE(blank_change.is_null());
 
   SurfaceSequence expected1(1u, 1u);
   SurfaceSequence expected2(2u, 1u);
 
   layer_tree_host2->SetRootLayer(nullptr);
@@ skipping 15 matching lines @@
 
   // Layer was removed so sequence from first LayerTreeHost should be
   // satisfied.
   EXPECT_TRUE(blank_change == expected1);
 
   // No more SurfaceSequences should have been generated that need to have be
   // satisfied.
   EXPECT_EQ(2u, required_seq.size());
 }
 
+static void CalcDrawProps(FakeLayerTreeHost* host, float device_scale_factor) {
+  RenderSurfaceLayerList render_surface_layer_list;
+  LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
+      host->root_layer(), gfx::Size(500, 500), &render_surface_layer_list);
+  inputs.device_scale_factor = device_scale_factor;
+  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+}
+
 // Check that setting content scale on the surface works.
 TEST_F(SurfaceLayerTest, ScaleSurface) {
   SurfaceSequence blank_change;
   SurfaceId required_id;
   std::set<SurfaceSequence> required_seq;
   scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
   gfx::Size surface_size(10, 15);
-  layer->SetSurfaceId(SurfaceId(1), surface_size);
+  layer->SetSurfaceId(SurfaceId(1), 2.f, surface_size);
   layer->SetBounds(gfx::Size(25, 45));
+  layer_tree_host_->SetRootLayer(layer);
 
-  float scale_x;
-  float scale_y;
-  gfx::Size bounds;
-  layer->CalculateContentsScale(2.f, &scale_x, &scale_y, &bounds);
-  EXPECT_EQ(10.f / 25.f, scale_x);
-  EXPECT_EQ(15.f / 45.f, scale_y);
-  EXPECT_EQ(surface_size.ToString(), bounds.ToString());
+  CalcDrawProps(layer_tree_host_.get(), 5.f);
+  EXPECT_EQ(2.f, layer->contents_scale_x());
+  EXPECT_EQ(2.f, layer->contents_scale_y());
+  EXPECT_EQ(surface_size.ToString(), layer->content_bounds().ToString());
 
-  layer->SetBounds(gfx::Size(0, 0));
-  layer->CalculateContentsScale(2.f, &scale_x, &scale_y, &bounds);
-  EXPECT_EQ(1.f, scale_x);
-  EXPECT_EQ(1.f, scale_y);
-  EXPECT_EQ(surface_size.ToString(), bounds.ToString());
+  layer_tree_host_->SetRootLayer(nullptr);
+  layer_tree_host_.reset();
 }
 
 // Check that SurfaceSequence is sent through swap promise.
 class SurfaceLayerSwapPromise : public LayerTreeTest {
  public:
   SurfaceLayerSwapPromise()
       : commit_count_(0), sequence_was_satisfied_(false) {}
 
   void BeginTest() override {
     layer_tree_host()->set_surface_id_namespace(1);
     layer_ = SurfaceLayer::Create(
         base::Bind(&SatisfyCallback, &satisfied_sequence_),
         base::Bind(&RequireCallback, &required_id_, &required_set_));
-    layer_->SetSurfaceId(SurfaceId(1), gfx::Size(1, 1));
+    layer_->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
 
     // Layer hasn't been added to tree so no SurfaceSequence generated yet.
     EXPECT_EQ(0u, required_set_.size());
 
     layer_tree_host()->SetRootLayer(layer_);
 
     // Should have SurfaceSequence from first tree.
     SurfaceSequence expected(1u, 1u);
     EXPECT_TRUE(required_id_ == SurfaceId(1));
     EXPECT_EQ(1u, required_set_.size());
@@ skipping 62 matching lines @@
   SurfaceId required_id_;
   std::set<SurfaceSequence> required_set_;
 };
 
 // TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is
 // fixed.
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromise);
 
 }  // namespace
 }  // namespace cc