Rename LocalFrameId to LocalSurfaceId

third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp

 // Copyright 2016 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 "platform/graphics/OffscreenCanvasFrameDispatcherImpl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "platform/CrossThreadFunctional.h"
@@ skipping 30 matching lines @@
     int width,
     int height)
     : OffscreenCanvasFrameDispatcher(client),
       m_frameSinkId(cc::FrameSinkId(clientId, sinkId)),
       m_width(width),
       m_height(height),
       m_changeSizeForNextCommit(false),
       m_nextResourceId(1u),
       m_binding(this),
       m_placeholderCanvasId(canvasId) {
-  m_currentLocalFrameId = m_surfaceIdAllocator.GenerateId();
+  m_currentLocalSurfaceId = m_surfaceIdAllocator.GenerateId();
   DCHECK(!m_sink.is_bound());
   mojom::blink::OffscreenCanvasCompositorFrameSinkProviderPtr provider;
   Platform::current()->interfaceProvider()->getInterface(
       mojo::MakeRequest(&provider));
   provider->CreateCompositorFrameSink(m_frameSinkId,
                                       m_binding.CreateInterfacePtrAndBind(),
                                       mojo::MakeRequest(&m_sink));
 }
 
 OffscreenCanvasFrameDispatcherImpl::~OffscreenCanvasFrameDispatcherImpl() {
@@ skipping 299 matching lines @@
                                      0, 10000000, 50));
         commitSoftwareCanvasSoftwareCompositingWorkerTimer.count(elapsedTime *
                                                                  1000000.0);
       }
       break;
     case OffscreenCanvasCommitTypeCount:
       NOTREACHED();
   }
 
   if (m_changeSizeForNextCommit) {
-    m_currentLocalFrameId = m_surfaceIdAllocator.GenerateId();
+    m_currentLocalSurfaceId = m_surfaceIdAllocator.GenerateId();
     m_changeSizeForNextCommit = false;
   }
-  m_sink->SubmitCompositorFrame(m_currentLocalFrameId, std::move(frame));
+  m_sink->SubmitCompositorFrame(m_currentLocalSurfaceId, std::move(frame));
 
   // TODO(crbug.com/674744): Get BeginFrame to fire on its own.
   scheduleSyntheticBeginFrame();
 }
 
 void OffscreenCanvasFrameDispatcherImpl::scheduleSyntheticBeginFrame() {
   m_syntheticBeginFrameTask =
       Platform::current()
           ->currentThread()
           ->getWebTaskRunner()
@@ skipping 65 matching lines @@
 
 void OffscreenCanvasFrameDispatcherImpl::reshape(int width, int height) {
   if (m_width != width || m_height != height) {
     m_width = width;
     m_height = height;
     m_changeSizeForNextCommit = true;
   }
 }
 
 }  // namespace blink