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

cc/surfaces/surface_aggregator_perftest.cc

Index: cc/surfaces/surface_aggregator_perftest.cc
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc
index d0c2ed4f6a94d1253695e6e480f2012c8ad57cc3..ac7fb4b5b45d04e938e45c5955d3bb6a82e9338f 100644
--- a/cc/surfaces/surface_aggregator_perftest.cc
+++ b/cc/surfaces/surface_aggregator_perftest.cc
@@ -10,6 +10,7 @@
 #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"
@@ -27,14 +28,6 @@ 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() {
@@ -63,8 +56,11 @@ class SurfaceAggregatorPerfTest : public testing::Test {
                                             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++) {
@@ -116,7 +112,7 @@ class SurfaceAggregatorPerfTest : public testing::Test {
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
-      CompositorFrame frame = MakeCompositorFrame();
+      CompositorFrame frame = test::MakeEmptyCompositorFrame();
 
       SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
       SurfaceDrawQuad* surface_quad =
@@ -127,6 +123,8 @@ class SurfaceAggregatorPerfTest : public testing::Test {
                     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