Reland "Enforce constant size and device scale factor for surfaces" with fixes

cc/surfaces/surface_aggregator_perftest.cc

 // Copyright 2015 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/memory/ptr_util.h"
 #include "cc/base/lap_timer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/surface_aggregator.h"
 #include "cc/surfaces/surface_manager.h"
+#include "cc/test/compositor_frame_helpers.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_resource_provider.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
 namespace cc {
 namespace {
 
 constexpr bool kIsRoot = true;
 constexpr bool kIsChildRoot = false;
 constexpr bool kHandlesFrameSinkIdInvalidation = true;
 constexpr bool kNeedsSyncPoints = true;
 
 const base::UnguessableToken kArbitraryToken = base::UnguessableToken::Create();
 
-CompositorFrame MakeCompositorFrame() {
-  CompositorFrame frame;
-  frame.metadata.begin_frame_ack.source_id = BeginFrameArgs::kManualSourceId;
-  frame.metadata.begin_frame_ack.sequence_number =
-      BeginFrameArgs::kStartingFrameNumber;
-  return frame;
-}
-
 class SurfaceAggregatorPerfTest : public testing::Test {
  public:
   SurfaceAggregatorPerfTest() {
     context_provider_ = TestContextProvider::Create();
     context_provider_->BindToCurrentThread();
     shared_bitmap_manager_.reset(new TestSharedBitmapManager);
 
     resource_provider_ = FakeResourceProvider::Create(
         context_provider_.get(), shared_bitmap_manager_.get());
   }
 
   void RunTest(int num_surfaces,
                int num_textures,
                float opacity,
                bool optimize_damage,
                bool full_damage,
                const std::string& name) {
     std::vector<std::unique_ptr<CompositorFrameSinkSupport>> child_supports(
         num_surfaces);
     for (int i = 0; i < num_surfaces; i++) {
       child_supports[i] = CompositorFrameSinkSupport::Create(
           nullptr, &manager_, FrameSinkId(1, i + 1), kIsChildRoot,
           kHandlesFrameSinkIdInvalidation, kNeedsSyncPoints);
     }
     aggregator_.reset(new SurfaceAggregator(&manager_, resource_provider_.get(),
                                             optimize_damage));
     for (int i = 0; i < num_surfaces; i++) {
       LocalSurfaceId local_surface_id(i + 1, kArbitraryToken);
+
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
-      CompositorFrame frame = MakeCompositorFrame();
+      pass->output_rect = gfx::Rect(0, 0, 1, 2);
+
+      CompositorFrame frame = test::MakeEmptyCompositorFrame();
 
       SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
       for (int j = 0; j < num_textures; j++) {
         TransferableResource resource;
         resource.id = j;
         resource.is_software = true;
         frame.resource_list.push_back(resource);
 
         TextureDrawQuad* quad =
             pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
@@ skipping 31 matching lines @@
                                                std::move(frame));
     }
 
     std::unique_ptr<CompositorFrameSinkSupport> root_support =
         CompositorFrameSinkSupport::Create(
             nullptr, &manager_, FrameSinkId(1, num_surfaces + 1), kIsRoot,
             kHandlesFrameSinkIdInvalidation, kNeedsSyncPoints);
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
-      CompositorFrame frame = MakeCompositorFrame();
+      CompositorFrame frame = test::MakeEmptyCompositorFrame();
 
       SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
       SurfaceDrawQuad* surface_quad =
           pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
       surface_quad->SetNew(
           sqs, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 100, 100),
           SurfaceId(FrameSinkId(1, num_surfaces),
                     LocalSurfaceId(num_surfaces, kArbitraryToken)),
           SurfaceDrawQuadType::PRIMARY, nullptr);
 
+      pass->output_rect = gfx::Rect(0, 0, 100, 100);
+
       if (full_damage)
         pass->damage_rect = gfx::Rect(0, 0, 100, 100);
       else
         pass->damage_rect = gfx::Rect(0, 0, 1, 1);
 
       frame.render_pass_list.push_back(std::move(pass));
 
       root_support->SubmitCompositorFrame(
           LocalSurfaceId(num_surfaces + 1, kArbitraryToken), std::move(frame));
 
@@ skipping 42 matching lines @@
 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesDamageCalc) {
   RunTest(3, 1000, 1.f, true, true, "few_surfaces_damage_calc");
 }
 
 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesAggregateDamaged) {
   RunTest(3, 1000, 1.f, true, false, "few_surfaces_aggregate_damaged");
 }
 
 }  // namespace
 }  // namespace cc