Mus+Ash: Towards Unifying CompositorFrameSink terminology

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/Histogram.h"
@@ skipping 50 matching lines @@
       image->isPremultiplied() ? kPremul_SkAlphaType : kUnpremul_SkAlphaType);
   // TODO(xlai): Optimize to avoid copying pixels. See crbug.com/651456.
   // However, in the case when |image| is texture backed, this function call
   // does a GPU readback which is required.
   image->imageForCurrentFrame()->readPixels(imageInfo, pixels,
                                             imageInfo.minRowBytes(), 0, 0);
   resource.mailbox_holder.mailbox = bitmap->id();
   resource.mailbox_holder.texture_target = 0;
   resource.is_software = true;
 
-  // Hold ref to |bitmap|, to keep it alive until the browser ReturnResources.
+  // Hold ref to |bitmap|, to keep it alive until the browser ReclaimResources.
   // It guarantees that the shared bitmap is not re-used or deleted.
   m_sharedBitmaps.add(m_nextResourceId, std::move(bitmap));
 }
 
 void OffscreenCanvasFrameDispatcherImpl::
     setTransferableResourceToSharedGPUContext(
         cc::TransferableResource& resource,
         RefPtr<StaticBitmapImage> image) {
   // TODO(crbug.com/652707): When committing the first frame, there is no
   // instance of SharedGpuContext yet, calling SharedGpuContext::gl() will
@@ skipping 37 matching lines @@
   gl->ShallowFlushCHROMIUM();
   gpu::SyncToken syncToken;
   gl->GenSyncTokenCHROMIUM(fenceSync, syncToken.GetData());
 
   resource.mailbox_holder =
       gpu::MailboxHolder(mailbox, syncToken, GL_TEXTURE_2D);
   resource.read_lock_fences_enabled = false;
   resource.is_software = false;
 
   // Hold ref to |textureId| for the piece of GPU memory where the pixel data
-  // is uploaded to, to keep it alive until the browser ReturnResources.
+  // is uploaded to, to keep it alive until the browser ReclaimResources.
   m_cachedTextureIds.add(m_nextResourceId, textureId);
 }
 
 void OffscreenCanvasFrameDispatcherImpl::
     setTransferableResourceToStaticBitmapImage(
         cc::TransferableResource& resource,
         RefPtr<StaticBitmapImage> image) {
   image->ensureMailbox();
   resource.mailbox_holder = gpu::MailboxHolder(
       image->getMailbox(), image->getSyncToken(), GL_TEXTURE_2D);
   resource.read_lock_fences_enabled = false;
   resource.is_software = false;
 
-  // Hold ref to |image|, to keep it alive until the browser ReturnResources.
+  // Hold ref to |image|, to keep it alive until the browser ReclaimResources.
   // It guarantees that the resource is not re-used or deleted.
   m_cachedImages.add(m_nextResourceId, std::move(image));
 }
 
 void OffscreenCanvasFrameDispatcherImpl::dispatchFrame(
     RefPtr<StaticBitmapImage> image,
     double commitStartTime,
     bool isWebGLSoftwareRendering /* This flag is true when WebGL's commit is
     called on SwiftShader. */) {
   if (!image)
@@ skipping 151 matching lines @@
                              "SoftwareCanvasSoftwareCompositingWorker",
                              0, 10000000, 50));
         commitSoftwareCanvasSoftwareCompositingWorkerTimer.count(elapsedTime *
                                                                  1000000.0);
       }
       break;
     case OffscreenCanvasCommitTypeCount:
       NOTREACHED();
   }
 
-  m_sink->SubmitCompositorFrame(std::move(frame), base::Closure());
+  m_sink->SubmitCompositorFrame(std::move(frame));
 }
 
-void OffscreenCanvasFrameDispatcherImpl::ReturnResources(
+void OffscreenCanvasFrameDispatcherImpl::DidReceiveCompositorFrameAck() {
+  // FIXME: Implement this.

[rjkroege, 2016/10/20 21:33:18]

TODO(fsamuel)

[Fady Samuel, 2016/10/20 23:04:10]

Done.

+}
+
+void OffscreenCanvasFrameDispatcherImpl::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (const auto& resource : resources) {
     m_cachedImages.remove(resource.id);
     m_sharedBitmaps.remove(resource.id);
     m_cachedTextureIds.remove(resource.id);
   }
 }
 
 bool OffscreenCanvasFrameDispatcherImpl::verifyImageSize(
     const sk_sp<SkImage>& image) {
   if (image && image->width() == m_width && image->height() == m_height)
     return true;
   return false;
 }
 
 }  // namespace blink