Rename LocalFrameId to LocalSurfaceId

services/ui/public/cpp/window_compositor_frame_sink.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 "services/ui/public/cpp/window_compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink_client.h"
@@ skipping 53 matching lines @@
 void WindowCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   DCHECK(thread_checker_);
   DCHECK(thread_checker_->CalledOnValidThread());
   if (!compositor_frame_sink_)
     return;
 
   gfx::Size frame_size = last_submitted_frame_size_;
   if (!frame.render_pass_list.empty())
     frame_size = frame.render_pass_list[0]->output_rect.size();
-  if (!local_frame_id_.is_valid() || frame_size != last_submitted_frame_size_)
-    local_frame_id_ = id_allocator_.GenerateId();
+  if (!local_surface_id_.is_valid() || frame_size != last_submitted_frame_size_)
+    local_surface_id_ = id_allocator_.GenerateId();
 
-  compositor_frame_sink_->SubmitCompositorFrame(local_frame_id_,
+  compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_,
                                                 std::move(frame));
 
   last_submitted_frame_size_ = frame_size;
 }
 
 WindowCompositorFrameSink::WindowCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info,
@@ skipping 49 matching lines @@
 WindowCompositorFrameSinkBinding::TakeFrameSinkRequest() {
   return std::move(compositor_frame_sink_request_);
 }
 
 cc::mojom::MojoCompositorFrameSinkClientPtrInfo
 WindowCompositorFrameSinkBinding::TakeFrameSinkClient() {
   return std::move(compositor_frame_sink_client_);
 }
 
 }  // namespace ui