Unify SurfaceInfo

services/ui/ws/frame_generator_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/ws/frame_generator.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/test/test_message_loop.h"
@@ skipping 16 matching lines @@
 constexpr WindowId kRootDisplayId(0, 2);
 const base::UnguessableToken kArbitraryToken = base::UnguessableToken::Create();
 
 // Makes the window visible and creates the default surface for it.
 void InitWindow(ServerWindow* window) {
   window->SetVisible(true);
   ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->GetOrCreateCompositorFrameSinkManager();
   compositor_frame_sink_manager->SetLatestSurfaceInfo(
       mojom::CompositorFrameSinkType::DEFAULT,
-      cc::SurfaceId(
-          cc::FrameSinkId(
-              WindowIdToTransportId(window->id()),
-              static_cast<uint32_t>(mojom::CompositorFrameSinkType::DEFAULT)),
-          cc::LocalFrameId(1u, kArbitraryToken)),
-      gfx::Size(100, 100));
+      cc::SurfaceInfo(
+          cc::SurfaceId(
+              cc::FrameSinkId(WindowIdToTransportId(window->id()),
+                              static_cast<uint32_t>(
+                                  mojom::CompositorFrameSinkType::DEFAULT)),
+              cc::LocalFrameId(1u, kArbitraryToken)),
+          1.0f, gfx::Size(100, 100)));
 }
 
 }  // namespace
 
 class FrameGeneratorTest : public testing::Test {
  public:
   FrameGeneratorTest()
       : root_window_(base::MakeUnique<ServerWindow>(&window_delegate_,
                                                     kRootDisplayId)) {}
   ~FrameGeneratorTest() override {}
@@ skipping 65 matching lines @@
   cc::SharedQuadState* child_sqs = quad_state_list->front();
   EXPECT_EQ(root_opacity, root_sqs->opacity);
   // Child's SharedQuadState contains the effective opacity of the child layer,
   // which should be a product of the child and the parent opacity.
   EXPECT_EQ(child_opacity * root_opacity, child_sqs->opacity);
 
   // Pretend to create the UNDERLAY Surface for the child window, and confirm
   // that this creates an extra SharedQuadState in the CompositorFrame.
   child_window.GetOrCreateCompositorFrameSinkManager()->SetLatestSurfaceInfo(
       mojom::CompositorFrameSinkType::UNDERLAY,
-      cc::SurfaceId(
-          cc::FrameSinkId(
-              WindowIdToTransportId(child_window.id()),
-              static_cast<uint32_t>(mojom::CompositorFrameSinkType::UNDERLAY)),
-          cc::LocalFrameId(1u, kArbitraryToken)),
-      gfx::Size(100, 100));
+      cc::SurfaceInfo(
+          cc::SurfaceId(
+              cc::FrameSinkId(WindowIdToTransportId(child_window.id()),
+                              static_cast<uint32_t>(
+                                  mojom::CompositorFrameSinkType::UNDERLAY)),
+              cc::LocalFrameId(1u, kArbitraryToken)),
+          1.0f, gfx::Size(100, 100)));
 
   render_pass = cc::RenderPass::Create();
   DrawWindowTree(render_pass.get());
   quad_state_list = &render_pass->shared_quad_state_list;
   EXPECT_EQ(3u, quad_state_list->size());
   auto it = quad_state_list->begin();
   EXPECT_EQ(child_opacity * root_opacity, (*it)->opacity);
   EXPECT_EQ(child_opacity * root_opacity, (*++it)->opacity);
   EXPECT_EQ(root_opacity, (*++it)->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui