Refactor AcceleratedStaticBitmapImage

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 117 matching lines @@
 
   // Hold ref to |textureId| for the piece of GPU memory where the pixel data
   // 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();

[xidachen, 2016/11/04 13:18:03]

junov@: Then in here, we call image->ensureMailbox() to convert the
texture-backed SkImage back to texture again. Oh, man...

-  resource.mailbox_holder = gpu::MailboxHolder(
-      image->getMailbox(), image->getSyncToken(), GL_TEXTURE_2D);
+  resource.mailbox_holder =
+      gpu::MailboxHolder(image->mailbox(), image->syncToken(), GL_TEXTURE_2D);
   resource.read_lock_fences_enabled = false;
   resource.is_software = false;
 
   // 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)
     return;
-  if (!verifyImageSize(image->imageForCurrentFrame()))
+  if (!verifyImageSize(image->size()))
     return;
   cc::CompositorFrame frame;
   // TODO(crbug.com/652931): update the device_scale_factor
   frame.metadata.device_scale_factor = 1.0f;
 
   const gfx::Rect bounds(m_width, m_height);
   const cc::RenderPassId renderPassId(1, 1);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   pass->SetAll(renderPassId, bounds, bounds, gfx::Transform(), false);
 
@@ skipping 147 matching lines @@
   m_sink->SubmitCompositorFrame(std::move(frame));
 }
 
 void OffscreenCanvasFrameDispatcherImpl::DidReceiveCompositorFrameAck() {
   // TODO(fsamuel): Implement this.
 }
 
 void OffscreenCanvasFrameDispatcherImpl::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (const auto& resource : resources) {
+    RefPtr<StaticBitmapImage> image = m_cachedImages.get(resource.id);
+    if (image)
+      image->updateSyncToken(resource.sync_token);
     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)
+    const IntSize imageSize) {
+  if (imageSize.width() == m_width && imageSize.height() == m_height)
     return true;
   return false;
 }
 
 }  // namespace blink