Rename LocalFrameId to LocalSurfaceId

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/debug/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/surface_aggregator.h"
@@ skipping 36 matching lines @@
                bool optimize_damage,
                bool full_damage,
                const std::string& name) {
     std::vector<std::unique_ptr<SurfaceFactory>> child_factories(num_surfaces);
     for (int i = 0; i < num_surfaces; i++)
       child_factories[i].reset(
           new SurfaceFactory(FrameSinkId(1, i + 1), &manager_, &empty_client_));
     aggregator_.reset(new SurfaceAggregator(&manager_, resource_provider_.get(),
                                             optimize_damage));
     for (int i = 0; i < num_surfaces; i++) {
-      LocalFrameId local_frame_id(i + 1, kArbitraryToken);
+      LocalSurfaceId local_surface_id(i + 1, kArbitraryToken);
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
       CompositorFrame frame;
 
       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);
 
@@ skipping 17 matching lines @@
                      uv_bottom_right, background_color, vertex_opacity, flipped,
                      nearest_neighbor, false);
       }
       sqs = pass->CreateAndAppendSharedQuadState();
       sqs->opacity = opacity;
       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(FrameSinkId(1, i), LocalFrameId(i, kArbitraryToken)));
+            SurfaceId(FrameSinkId(1, i), LocalSurfaceId(i, kArbitraryToken)));
       }
 
       frame.render_pass_list.push_back(std::move(pass));
       child_factories[i]->SubmitCompositorFrame(
-          local_frame_id, std::move(frame), SurfaceFactory::DrawCallback());
+          local_surface_id, std::move(frame), SurfaceFactory::DrawCallback());
     }
 
     SurfaceFactory root_factory(FrameSinkId(1, num_surfaces + 1), &manager_,
                                 &empty_client_);
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
       CompositorFrame frame;
 
       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),
-                    LocalFrameId(num_surfaces, kArbitraryToken)));
+                    LocalSurfaceId(num_surfaces, kArbitraryToken)));
 
       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_factory.SubmitCompositorFrame(
-          LocalFrameId(num_surfaces + 1, kArbitraryToken), std::move(frame),
+          LocalSurfaceId(num_surfaces + 1, kArbitraryToken), std::move(frame),
           SurfaceFactory::DrawCallback());
 
       CompositorFrame aggregated = aggregator_->Aggregate(
           SurfaceId(FrameSinkId(1, num_surfaces + 1),
-                    LocalFrameId(num_surfaces + 1, kArbitraryToken)));
+                    LocalSurfaceId(num_surfaces + 1, kArbitraryToken)));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(),
                            "runs/s", true);
     for (int i = 0; i < num_surfaces; i++)
       child_factories[i]->EvictSurface();
     root_factory.EvictSurface();
   }
 
@@ skipping 30 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