Introduce cc::LocalFrameId and use in SurfaceFactory

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 30cbdff4c6f1ac72c3b8d08332b7afaaac48b2e2..828518d732562355153294e514872dd7fa5fdbf4 100644
--- a/cc/surfaces/surface_aggregator_perftest.cc
+++ b/cc/surfaces/surface_aggregator_perftest.cc
@@ -51,7 +51,8 @@ class SurfaceAggregatorPerfTest : public testing::Test {
     aggregator_.reset(new SurfaceAggregator(&manager_, resource_provider_.get(),
                                             optimize_damage));
     for (int i = 1; i <= num_surfaces; i++) {
-      factory_.Create(SurfaceId(kArbitraryFrameSinkId, i, 0));
+      LocalFrameId local_frame_id(i, 0);
+      factory_.Create(local_frame_id);
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
       std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
 
@@ -87,19 +88,19 @@ class SurfaceAggregatorPerfTest : public testing::Test {
       if (i > 1) {
         SurfaceDrawQuad* surface_quad =
             pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
-        surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
-                             SurfaceId(kArbitraryFrameSinkId, i - 1, 0));
+        surface_quad->SetNew(
+            sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
+            SurfaceId(kArbitraryFrameSinkId, LocalFrameId(i - 1, 0)));
       }
 
       frame_data->render_pass_list.push_back(std::move(pass));
       CompositorFrame frame;
       frame.delegated_frame_data = std::move(frame_data);
-      factory_.SubmitCompositorFrame(SurfaceId(kArbitraryFrameSinkId, i, 0),
-                                     std::move(frame),
+      factory_.SubmitCompositorFrame(local_frame_id, std::move(frame),
                                      SurfaceFactory::DrawCallback());
     }
 
-    factory_.Create(SurfaceId(kArbitraryFrameSinkId, num_surfaces + 1, 0));
+    factory_.Create(LocalFrameId(num_surfaces + 1, 0));
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
@@ -108,9 +109,9 @@ class SurfaceAggregatorPerfTest : public testing::Test {
       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(kArbitraryFrameSinkId, num_surfaces, 0));
+      surface_quad->SetNew(
+          sqs, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 100, 100),
+          SurfaceId(kArbitraryFrameSinkId, LocalFrameId(num_surfaces, 0)));
 
       if (full_damage)
         pass->damage_rect = gfx::Rect(0, 0, 100, 100);
@@ -120,21 +121,21 @@ class SurfaceAggregatorPerfTest : public testing::Test {
       frame_data->render_pass_list.push_back(std::move(pass));
       CompositorFrame frame;
       frame.delegated_frame_data = std::move(frame_data);
-      factory_.SubmitCompositorFrame(
-          SurfaceId(kArbitraryFrameSinkId, num_surfaces + 1, 0),
-          std::move(frame), SurfaceFactory::DrawCallback());
+      factory_.SubmitCompositorFrame(LocalFrameId(num_surfaces + 1, 0),
+                                     std::move(frame),
+                                     SurfaceFactory::DrawCallback());
 
       CompositorFrame aggregated = aggregator_->Aggregate(
-          SurfaceId(kArbitraryFrameSinkId, num_surfaces + 1, 0));
+          SurfaceId(kArbitraryFrameSinkId, LocalFrameId(num_surfaces + 1, 0)));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(),
                            "runs/s", true);
 
-    factory_.Destroy(SurfaceId(kArbitraryFrameSinkId, num_surfaces + 1, 0));
+    factory_.Destroy(LocalFrameId(num_surfaces + 1, 0));
     for (int i = 1; i <= num_surfaces; i++)
-      factory_.Destroy(SurfaceId(kArbitraryFrameSinkId, i, 0));
+      factory_.Destroy(LocalFrameId(i, 0));
   }
 
  protected: