Unify SurfaceInfo

services/ui/surfaces/display_compositor_unittest.cc

 // Copyright 2016 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 "services/ui/surfaces/display_compositor.h"
 
 #include <inttypes.h>
 
 #include <string>
 #include <utility>
@@ skipping 54 matching lines @@
       events_ += ";";
     events_ += text;
   }
 
   // cc::mojom::DisplayCompositorClient:
   void OnDisplayCompositorCreated(
       const cc::SurfaceId& root_surface_id) override {
     got_root_surface_id_ = true;
   }
 
-  void OnSurfaceCreated(const cc::SurfaceId& surface_id,
-                        const gfx::Size& frame_size,
-                        float device_scale_factor) override {
+  void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override {
     EXPECT_TRUE(got_root_surface_id_);
     AddEvent(base::StringPrintf("OnSurfaceCreated(%s)",
-                                SurfaceIdString(surface_id).c_str()));
+                                SurfaceIdString(surface_info.id()).c_str()));
   }
 
   mojo::Binding<cc::mojom::DisplayCompositorClient> binding_;
   std::string events_;
   bool got_root_surface_id_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayCompositorClient);
 };
 
 // Test SurfaceReferenceManager that records AddSurfaceReference() and
@@ skipping 95 matching lines @@
   TestSurfaceReferenceManager reference_manager_;
   std::unique_ptr<DisplayCompositor> display_compositor_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositorTest);
 };
 
 TEST_F(DisplayCompositorTest, AddSurfaceThenReference) {
   const cc::SurfaceId parent_id = MakeSurfaceId(1, 1, 1);
   const cc::SurfaceId surface_id = MakeSurfaceId(2, 1, 1);
-  surface_observer()->OnSurfaceCreated(surface_id, gfx::Size(1, 1), 1.0f);
+  surface_observer()->OnSurfaceCreated(
+      cc::SurfaceInfo(surface_id, 1.0f, gfx::Size(1, 1)));
   RunUntilIdle();
 
   // Client should get OnSurfaceCreated call and temporary reference added.
   EXPECT_EQ("OnSurfaceCreated(2:1:1)", client_.events());
   EXPECT_EQ("Add(0:0:0-2:1:1)", reference_manager_.events());
   EXPECT_EQ(1u, CountTempReferences());
 
   AddSurfaceReference(parent_id, surface_id);
   RunUntilIdle();
 
   // Real reference is added then temporary reference removed.
   EXPECT_EQ("Add(1:1:1-2:1:1);Remove(0:0:0-2:1:1)",
             reference_manager_.events());
   EXPECT_EQ(0u, CountTempReferences());
 }
 
 TEST_F(DisplayCompositorTest, AddSurfaceThenRootReference) {
   const cc::SurfaceId surface_id = MakeSurfaceId(1, 1, 1);
-  surface_observer()->OnSurfaceCreated(surface_id, gfx::Size(1, 1), 1.0f);
+  surface_observer()->OnSurfaceCreated(
+      cc::SurfaceInfo(surface_id, 1.0f, gfx::Size(1, 1)));
   RunUntilIdle();
 
   // Temporary reference should be added.
   EXPECT_EQ("Add(0:0:0-1:1:1)", reference_manager_.events());
   EXPECT_EQ(1u, CountTempReferences());
 
   AddSurfaceReference(GetRootSurfaceId(), surface_id);
   RunUntilIdle();
 
   // Adding real reference doesn't need to change anything in
   // SurfaceReferenceManager does remove the temporary reference marker.
   EXPECT_EQ("", reference_manager_.events());
   EXPECT_EQ(0u, CountTempReferences());
 }
 
 TEST_F(DisplayCompositorTest, AddTwoSurfacesThenOneReference) {
   const cc::SurfaceId parent_id = MakeSurfaceId(1, 1, 1);
   const cc::SurfaceId surface_id1 = MakeSurfaceId(2, 1, 1);
   const cc::SurfaceId surface_id2 = MakeSurfaceId(3, 1, 1);
 
   // Add two surfaces with different FrameSinkIds.
-  surface_observer()->OnSurfaceCreated(surface_id1, gfx::Size(1, 1), 1.0f);
-  surface_observer()->OnSurfaceCreated(surface_id2, gfx::Size(1, 1), 1.0f);
+  surface_observer()->OnSurfaceCreated(
+      cc::SurfaceInfo(surface_id1, 1.0f, gfx::Size(1, 1)));
+  surface_observer()->OnSurfaceCreated(
+      cc::SurfaceInfo(surface_id2, 1.0f, gfx::Size(1, 1)));
   RunUntilIdle();
 
   // Temporary reference should be added for both surfaces.
   EXPECT_EQ("Add(0:0:0-2:1:1);Add(0:0:0-3:1:1)", reference_manager_.events());
   EXPECT_EQ(2u, CountTempReferences());
 
   AddSurfaceReference(parent_id, surface_id1);
   RunUntilIdle();
 
   // Real reference is added then temporary reference removed for 2:1:1. There
   // should still be a temporary reference left to 3:1:1
   EXPECT_EQ("Add(1:1:1-2:1:1);Remove(0:0:0-2:1:1)",
             reference_manager_.events());
   EXPECT_EQ(1u, CountTempReferences());
 }
 
 TEST_F(DisplayCompositorTest, AddSurfacesSkipReference) {
   const cc::SurfaceId parent_id = MakeSurfaceId(1, 1, 1);
   const cc::SurfaceId surface_id1 = MakeSurfaceId(2, 1, 1);
   const cc::SurfaceId surface_id2 = MakeSurfaceId(2, 1, 2);
 
   // Add two surfaces that have the same FrameSinkId. This would happen when a
   // client submits two CFs before parent submits a new CF.
-  surface_observer()->OnSurfaceCreated(surface_id1, gfx::Size(1, 1), 1.0f);
-  surface_observer()->OnSurfaceCreated(surface_id2, gfx::Size(1, 1), 1.0f);
+  surface_observer()->OnSurfaceCreated(
+      cc::SurfaceInfo(surface_id1, 1.0f, gfx::Size(1, 1)));
+  surface_observer()->OnSurfaceCreated(
+      cc::SurfaceInfo(surface_id2, 1.0f, gfx::Size(1, 1)));
   RunUntilIdle();
 
   // Client should get OnSurfaceCreated call and temporary reference added for
   // both surfaces.
   EXPECT_EQ("OnSurfaceCreated(2:1:1);OnSurfaceCreated(2:1:2)",
             client_.events());
   EXPECT_EQ("Add(0:0:0-2:1:1);Add(0:0:0-2:1:2)", reference_manager_.events());
   EXPECT_EQ(2u, CountTempReferences());
 
   // Add a reference to the surface with the later LocalFrameId.
   AddSurfaceReference(parent_id, surface_id2);
   RunUntilIdle();
 
   // The real reference should be added for 2:1:2 and both temporary references
   // should be removed.
   EXPECT_EQ("Add(1:1:1-2:1:2);Remove(0:0:0-2:1:2);Remove(0:0:0-2:1:1)",
             reference_manager_.events());
   EXPECT_EQ(0u, CountTempReferences());
 }
 
 }  // namespace test
 }  // namespace ui