Rename LocalFrameId to LocalSurfaceId

cc/surfaces/surface_factory.cc

 // Copyright 2014 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 "cc/surfaces/surface_factory.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 33 matching lines @@
 }
 
 void SurfaceFactory::Reset() {
   EvictSurface();
   // Disown Surfaces that are still alive so that they don't try to unref
   // resources that we're not tracking any more.
   weak_factory_.InvalidateWeakPtrs();
   holder_.Reset();
 }
 
-void SurfaceFactory::SubmitCompositorFrame(const LocalFrameId& local_frame_id,
-                                           CompositorFrame frame,
-                                           const DrawCallback& callback) {
+void SurfaceFactory::SubmitCompositorFrame(
+    const LocalSurfaceId& local_surface_id,
+    CompositorFrame frame,
+    const DrawCallback& callback) {
   TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame");
-  DCHECK(local_frame_id.is_valid());
+  DCHECK(local_surface_id.is_valid());
   std::unique_ptr<Surface> surface;
   bool create_new_surface =
       (!current_surface_ ||
-       local_frame_id != current_surface_->surface_id().local_frame_id());
+       local_surface_id != current_surface_->surface_id().local_surface_id());
   if (!create_new_surface) {
     surface = std::move(current_surface_);
   } else {
-    surface = Create(local_frame_id);
+    surface = Create(local_surface_id);
     gfx::Size frame_size;
     // CompositorFrames may not be populated with a RenderPass in unit tests.
     if (!frame.render_pass_list.empty())
       frame_size = frame.render_pass_list.back()->output_rect.size();
     manager_->SurfaceCreated(SurfaceInfo(
         surface->surface_id(), frame.metadata.device_scale_factor, frame_size));
   }
   surface->QueueFrame(std::move(frame), callback);
-  if (!manager_->SurfaceModified(SurfaceId(frame_sink_id_, local_frame_id))) {
+  if (!manager_->SurfaceModified(SurfaceId(frame_sink_id_, local_surface_id))) {
     TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD);
     surface->RunDrawCallbacks();
   }
   if (current_surface_ && create_new_surface) {
     surface->SetPreviousFrameSurface(current_surface_.get());
     Destroy(std::move(current_surface_));
   }
   current_surface_ = std::move(surface);
 }
 
 void SurfaceFactory::RequestCopyOfSurface(
     std::unique_ptr<CopyOutputRequest> copy_request) {
   if (!current_surface_) {
     copy_request->SendEmptyResult();
     return;
   }
   DCHECK(current_surface_->factory().get() == this);
   current_surface_->RequestCopyOfOutput(std::move(copy_request));
   manager_->SurfaceModified(current_surface_->surface_id());
 }
 
 void SurfaceFactory::ClearSurface() {
   if (!current_surface_)
     return;
   current_surface_->EvictFrame();
   manager_->SurfaceModified(current_surface_->surface_id());
 }
 
-void SurfaceFactory::WillDrawSurface(const LocalFrameId& id,
+void SurfaceFactory::WillDrawSurface(const LocalSurfaceId& id,
                                      const gfx::Rect& damage_rect) {
   client_->WillDrawSurface(id, damage_rect);
 }
 
 void SurfaceFactory::ReceiveFromChild(
     const TransferableResourceArray& resources) {
   holder_.ReceiveFromChild(resources);
 }
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
   holder_.UnrefResources(resources);
 }
 
 std::unique_ptr<Surface> SurfaceFactory::Create(
-    const LocalFrameId& local_frame_id) {
+    const LocalSurfaceId& local_surface_id) {
   auto surface = base::MakeUnique<Surface>(
-      SurfaceId(frame_sink_id_, local_frame_id), weak_factory_.GetWeakPtr());
+      SurfaceId(frame_sink_id_, local_surface_id), weak_factory_.GetWeakPtr());
   manager_->RegisterSurface(surface.get());
   return surface;
 }
 
 void SurfaceFactory::Destroy(std::unique_ptr<Surface> surface) {
   if (manager_)
     manager_->Destroy(std::move(surface));
 }
 
 }  // namespace cc