Refactor AcceleratedStaticBitmapImage

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "platform/graphics/gpu/DrawingBuffer.h"
 
 #include "cc/resources/shared_bitmap.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/AcceleratedStaticBitmapImage.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/ImageBuffer.h"
+#include "platform/graphics/WebGraphicsContext3DProviderWrapper.h"
 #include "platform/graphics/gpu/Extensions3DUtil.h"
 #include "platform/tracing/TraceEvent.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebExternalBitmap.h"
 #include "public/platform/WebExternalTextureLayer.h"
 #include "public/platform/WebGraphicsContext3DProvider.h"
 #include "skia/ext/texture_handle.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
@@ skipping 84 matching lines @@
     bool wantAlphaChannel,
     bool premultipliedAlpha,
     PreserveDrawingBuffer preserve,
     WebGLVersion webGLVersion,
     bool wantDepth,
     bool wantStencil,
     ChromiumImageUsage chromiumImageUsage)
     : m_client(client),
       m_preserveDrawingBuffer(preserve),
       m_webGLVersion(webGLVersion),
-      m_contextProvider(std::move(contextProvider)),
-      m_gl(m_contextProvider->contextGL()),
+      m_contextProvider(wrapUnique(
+          new WebGraphicsContext3DProviderWrapper(std::move(contextProvider)))),
+      m_gl(m_contextProvider->contextProvider()->contextGL()),
       m_extensionsUtil(std::move(extensionsUtil)),
       m_discardFramebufferSupported(discardFramebufferSupported),
       m_wantAlphaChannel(wantAlphaChannel),
       m_premultipliedAlpha(premultipliedAlpha),
-      m_softwareRendering(m_contextProvider->isSoftwareRendering()),
+      m_softwareRendering(
+          m_contextProvider->contextProvider()->isSoftwareRendering()),

[Justin Novosad, 2016/11/08 20:41:50]

No need for m_contextProvider->
Just:
m_softwareRendering(contextProvider()->isSoftwareRendering())

[xidachen, 2016/11/08 21:01:54]

Done.

       m_wantDepth(wantDepth),
       m_wantStencil(wantStencil),
       m_chromiumImageUsage(chromiumImageUsage) {
   // Used by browser tests to detect the use of a DrawingBuffer.
   TRACE_EVENT_INSTANT0("test_gpu", "DrawingBufferCreation",
                        TRACE_EVENT_SCOPE_GLOBAL);
 }
 
 DrawingBuffer::~DrawingBuffer() {
   DCHECK(m_destructionInProgress);
@@ skipping 16 matching lines @@
   } else {
     ASSERT(!m_bufferClearNeeded);
   }
 }
 
 gpu::gles2::GLES2Interface* DrawingBuffer::contextGL() {
   return m_gl;
 }
 
 WebGraphicsContext3DProvider* DrawingBuffer::contextProvider() {
-  return m_contextProvider.get();
+  return m_contextProvider->contextProvider();
 }
 
 void DrawingBuffer::setIsHidden(bool hidden) {
   if (m_isHidden == hidden)
     return;
   m_isHidden = hidden;
   if (m_isHidden)
     m_recycledColorBufferQueue.clear();
 }
 
@@ skipping 236 matching lines @@
 
   RecycledBitmap recycled = {std::move(bitmap), m_size};
   m_recycledBitmaps.append(std::move(recycled));
 }
 
 PassRefPtr<StaticBitmapImage> DrawingBuffer::transferToStaticBitmapImage() {
   ScopedStateRestorer scopedStateRestorer(this);
 
   // This can be null if the context is lost before the first call to
   // grContext().
-  GrContext* grContext = m_contextProvider->grContext();
+  GrContext* grContext = m_contextProvider->contextProvider()->grContext();

[Justin Novosad, 2016/11/08 20:41:50]

No need for "m_contextProvider->"

[xidachen, 2016/11/08 21:01:54]

Done.

 
   cc::TextureMailbox textureMailbox;
   std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
   bool success = false;
   if (grContext) {
     bool forceGpuResult = true;
     success = prepareTextureMailboxInternal(&textureMailbox, &releaseCallback,
                                             forceGpuResult);
   }
   if (!success) {
@@ skipping 18 matching lines @@
   // back to it.
   // TODO(danakj): Instead of using PrepareTextureMailbox(), we could just use
   // the actual texture id and avoid needing to produce/consume a mailbox.
   GLuint textureId = m_gl->CreateAndConsumeTextureCHROMIUM(
       GL_TEXTURE_2D, textureMailbox.name());
   // Return the mailbox but report that the resource is lost to prevent trying
   // to use the backing for future frames. We keep it alive with our own
   // reference to the backing via our |textureId|.
   releaseCallback->Run(gpu::SyncToken(), true /* lostResource */);
 
-  // Store that texture id as the backing for an SkImage.
-  GrGLTextureInfo textureInfo;
-  textureInfo.fTarget = GL_TEXTURE_2D;
-  textureInfo.fID = textureId;
-  GrBackendTextureDesc backendTexture;
-  backendTexture.fOrigin = kBottomLeft_GrSurfaceOrigin;
-  backendTexture.fWidth = m_size.width();
-  backendTexture.fHeight = m_size.height();
-  backendTexture.fConfig = kSkia8888_GrPixelConfig;
-  backendTexture.fTextureHandle =
-      skia::GrGLTextureInfoToGrBackendObject(textureInfo);
-  sk_sp<SkImage> skImage =
-      SkImage::MakeFromAdoptedTexture(grContext, backendTexture);
-
   // We reuse the same mailbox name from above since our texture id was consumed
   // from it.
   const auto& skImageMailbox = textureMailbox.mailbox();
   // Use the sync token generated after producing the mailbox. Waiting for this
   // before trying to use the mailbox with some other context will ensure it is
   // valid. We wouldn't need to wait for the consume done in this function
   // because the texture id it generated would only be valid for the
   // DrawingBuffer's context anyways.
   const auto& skImageSyncToken = textureMailbox.sync_token();
 
   // TODO(xidachen): Create a small pool of recycled textures from
   // ImageBitmapRenderingContext's transferFromImageBitmap, and try to use them
   // in DrawingBuffer.
   return AcceleratedStaticBitmapImage::createFromWebGLContextImage(
-      std::move(skImage), skImageMailbox, skImageSyncToken);
+      skImageMailbox, skImageSyncToken, textureId,
+      m_contextProvider->createWeakPtr(), m_size);
 }
 
 DrawingBuffer::ColorBufferParameters
 DrawingBuffer::gpuMemoryBufferColorBufferParameters() {
 #if OS(MACOSX)
   // A CHROMIUM_image backed texture requires a specialized set of parameters
   // on OSX.
   ColorBufferParameters parameters;
   parameters.target = GC3D_TEXTURE_RECTANGLE_ARB;
 
@@ skipping 742 matching lines @@
   if (m_pixelUnpackBufferBindingDirty)
     client->DrawingBufferClientRestorePixelUnpackBufferBinding();
 }
 
 bool DrawingBuffer::shouldUseChromiumImage() {
   return RuntimeEnabledFeatures::webGLImageChromiumEnabled() &&
          m_chromiumImageUsage == AllowChromiumImage;
 }
 
 }  // namespace blink