color: Set GpuMemoryBuffer color spaces for Canvas

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

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/Canvas2DLayerBridge.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "platform/graphics/CanvasMetrics.h"
 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/gpu/SharedContextRateLimiter.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
@@ skipping 11 matching lines @@
 
 namespace {
 enum {
     InvalidMailboxIndex = -1,
     MaxCanvasAnimationBacklog = 2, // Make sure the the GPU is never more than two animation frames behind.
 };
 } // namespace
 
 namespace blink {
 
+#if USE_IOSURFACE_FOR_2D_CANVAS
+struct Canvas2DLayerBridge::ImageInfo : public RefCounted<ImageInfo> {
+    ImageInfo(std::unique_ptr<gfx::GpuMemoryBuffer>, GLuint imageId, GLuint textureId);
+    ~ImageInfo();
+
+    // The backing buffer.
+    std::unique_ptr<gfx::GpuMemoryBuffer> m_gpuMemoryBuffer;
+
+    // The id of the CHROMIUM image.
+    const GLuint m_imageId;
+
+    // The id of the texture bound to the CHROMIUM image.
+    const GLuint m_textureId;
+};
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
+
 static sk_sp<SkSurface> createSkSurface(GrContext* gr, const IntSize& size, int msaaSampleCount, OpacityMode opacityMode, sk_sp<SkColorSpace> colorSpace, bool* surfaceIsAccelerated)
 {
     if (gr)
         gr->resetContext();
 
     SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
     SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaType, colorSpace);
     SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry);
     sk_sp<SkSurface> surface;
 
@@ skipping 114 matching lines @@
     return m_filterQuality == kNone_SkFilterQuality ? GL_NEAREST : GL_LINEAR;
 }
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
 bool Canvas2DLayerBridge::prepareIOSurfaceMailboxFromImage(SkImage* image, cc::TextureMailbox* outMailbox)
 {
     // Need to flush skia's internal queue because texture is about to be accessed directly
     GrContext* grContext = m_contextProvider->grContext();
     grContext->flush();
 
-    ImageInfo imageInfo = createIOSurfaceBackedTexture();
-    if (imageInfo.empty())
+    RefPtr<ImageInfo> imageInfo = createIOSurfaceBackedTexture();
+    if (!imageInfo)
         return false;
 
     gpu::gles2::GLES2Interface* gl = contextGL();
     if (!gl)
         return false;
 
     GLuint imageTexture = skia::GrBackendObjectToGrGLTextureInfo(image->getTextureHandle(true))->fID;
-    gl->CopySubTextureCHROMIUM(imageTexture, imageInfo.m_textureId, 0, 0, 0, 0, m_size.width(), m_size.height(), GL_FALSE, GL_FALSE, GL_FALSE);
+    gl->CopySubTextureCHROMIUM(imageTexture, imageInfo->m_textureId, 0, 0, 0, 0, m_size.width(), m_size.height(), GL_FALSE, GL_FALSE, GL_FALSE);
 
     MailboxInfo& info = m_mailboxes.first();
     uint32_t textureTarget = GC3D_TEXTURE_RECTANGLE_ARB;
     gpu::Mailbox mailbox;
     gl->GenMailboxCHROMIUM(mailbox.name);
-    gl->ProduceTextureDirectCHROMIUM(imageInfo.m_textureId, textureTarget, mailbox.name);
+    gl->ProduceTextureDirectCHROMIUM(imageInfo->m_textureId, textureTarget, mailbox.name);
 
     const GLuint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
     gl->Flush();
     gpu::SyncToken syncToken;
     gl->GenSyncTokenCHROMIUM(fenceSync, syncToken.GetData());
 
     info.m_imageInfo = imageInfo;
     bool isOverlayCandidate = true;
     bool secureOutputOnly = false;
     info.m_mailbox = mailbox;
-    *outMailbox = cc::TextureMailbox(mailbox, syncToken, textureTarget, gfx::Size(m_size.width(), m_size.height()), isOverlayCandidate, secureOutputOnly);
+
+    *outMailbox = cc::TextureMailbox(mailbox, syncToken, textureTarget, gfx::Size(m_size), isOverlayCandidate, secureOutputOnly);
+    if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
+        gfx::ColorSpace colorSpace = gfx::ColorSpace::FromSkColorSpace(m_colorSpace);
+        outMailbox->set_color_space(colorSpace);
+        imageInfo->m_gpuMemoryBuffer->SetColorSpaceForScanout(colorSpace);
+    }
 
     gl->BindTexture(GC3D_TEXTURE_RECTANGLE_ARB, 0);
 
     // Because we are changing the texture binding without going through skia,
     // we must dirty the context.
     grContext->resetContext(kTextureBinding_GrGLBackendState);
 
     return true;
 }
 
-Canvas2DLayerBridge::ImageInfo Canvas2DLayerBridge::createIOSurfaceBackedTexture()
+RefPtr<Canvas2DLayerBridge::ImageInfo> Canvas2DLayerBridge::createIOSurfaceBackedTexture()
 {
     if (!m_imageInfoCache.isEmpty()) {
-        Canvas2DLayerBridge::ImageInfo info = m_imageInfoCache.last();
+        RefPtr<Canvas2DLayerBridge::ImageInfo> info = m_imageInfoCache.last();
         m_imageInfoCache.removeLast();
         return info;
     }
 
     gpu::gles2::GLES2Interface* gl = contextGL();
     if (!gl)
-        return Canvas2DLayerBridge::ImageInfo();
+        return nullptr;
 
-    GLuint imageId = gl->CreateGpuMemoryBufferImageCHROMIUM(m_size.width(), m_size.height(), GL_RGBA, GC3D_SCANOUT_CHROMIUM);
+    gpu::GpuMemoryBufferManager* gpuMemoryBufferManager = Platform::current()->getGpuMemoryBufferManager();
+    if (!gpuMemoryBufferManager)
+        return nullptr;
+
+    std::unique_ptr<gfx::GpuMemoryBuffer> gpuMemoryBuffer = gpuMemoryBufferManager->AllocateGpuMemoryBuffer(
+        gfx::Size(m_size), gfx::BufferFormat::RGBA_8888, gfx::BufferUsage::SCANOUT, gpu::kNullSurfaceHandle);
+    if (!gpuMemoryBuffer)
+        return nullptr;
+
+    GLuint imageId = gl->CreateImageCHROMIUM(
+        gpuMemoryBuffer->AsClientBuffer(), m_size.width(), m_size.height(), GL_RGBA);
     if (!imageId)
-        return Canvas2DLayerBridge::ImageInfo();
+        return nullptr;
 
     GLuint textureId;
     gl->GenTextures(1, &textureId);
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
     gl->BindTexture(target, textureId);
     gl->TexParameteri(target, GL_TEXTURE_MAG_FILTER, getGLFilter());
     gl->TexParameteri(target, GL_TEXTURE_MIN_FILTER, getGLFilter());
     gl->TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     gl->TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     gl->BindTexImage2DCHROMIUM(target, imageId);
 
-    return Canvas2DLayerBridge::ImageInfo(imageId, textureId);
+    return adoptRef(new Canvas2DLayerBridge::ImageInfo(std::move(gpuMemoryBuffer), imageId, textureId));
 }
 
-void Canvas2DLayerBridge::deleteCHROMIUMImage(ImageInfo info)
+void Canvas2DLayerBridge::deleteCHROMIUMImage(RefPtr<ImageInfo> info)
 {
     gpu::gles2::GLES2Interface* gl = contextGL();
     if (!gl)
         return;
 
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
-    gl->BindTexture(target, info.m_textureId);
-    gl->ReleaseTexImage2DCHROMIUM(target, info.m_imageId);
-    gl->DestroyImageCHROMIUM(info.m_imageId);
-    gl->DeleteTextures(1, &info.m_textureId);
+    gl->BindTexture(target, info->m_textureId);
+    gl->ReleaseTexImage2DCHROMIUM(target, info->m_imageId);
+    gl->DestroyImageCHROMIUM(info->m_imageId);
+    gl->DeleteTextures(1, &info->m_textureId);
     gl->BindTexture(target, 0);
+    info->m_gpuMemoryBuffer.reset();
 
     resetSkiaTextureBinding();
 }
 
 void Canvas2DLayerBridge::clearCHROMIUMImageCache()
 {
     for (const auto& it : m_imageInfoCache) {
         deleteCHROMIUMImage(it);
     }
     m_imageInfoCache.clear();
@@ skipping 569 matching lines @@
         --releasedMailboxInfo;
         if (releasedMailboxInfo->m_mailbox == mailbox)
             break;
         DCHECK(releasedMailboxInfo != firstMailbox);
     }
 
     if (!contextLost) {
         // Invalidate texture state in case the compositor altered it since the copy-on-write.
         if (releasedMailboxInfo->m_image) {
 #if USE_IOSURFACE_FOR_2D_CANVAS
-            DCHECK(releasedMailboxInfo->m_imageInfo.empty());
+            DCHECK(!releasedMailboxInfo->m_imageInfo);
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
             if (syncToken.HasData()) {
                 contextGL()->WaitSyncTokenCHROMIUM(syncToken.GetConstData());
             }
             GrTexture* texture = releasedMailboxInfo->m_image->getTexture();
             if (texture) {
                 if (lostResource) {
                     texture->abandon();
                 } else {
                     texture->textureParamsModified();
                     // Break the mailbox association to avoid leaking mailboxes every time skia recycles a texture.
                     gpu::gles2::GLES2Interface* gl = contextGL();
                     if (gl)
                         gl->ProduceTextureDirectCHROMIUM(0, GL_TEXTURE_2D, releasedMailboxInfo->m_mailbox.name);
                 }
             }
         }
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
-        if (!releasedMailboxInfo->m_imageInfo.empty() && !lostResource) {
+        if (releasedMailboxInfo->m_imageInfo && !lostResource) {
             m_imageInfoCache.append(releasedMailboxInfo->m_imageInfo);
         }
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
     }
 
     RefPtr<Canvas2DLayerBridge> selfRef;
     if (m_destructionInProgress) {
         // To avoid memory use after free, take a scoped self-reference
         // to postpone destruction until the end of this function.
         selfRef = this;
@@ skipping 96 matching lines @@
     getOrCreateSurface()->notifyContentWillChange(SkSurface::kRetain_ContentChangeMode);
     return m_surface->makeImageSnapshot();
 }
 
 void Canvas2DLayerBridge::willOverwriteCanvas()
 {
     skipQueuedDrawCommands();
 }
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
-Canvas2DLayerBridge::ImageInfo::ImageInfo(GLuint imageId, GLuint textureId) : m_imageId(imageId), m_textureId(textureId)
+Canvas2DLayerBridge::ImageInfo::ImageInfo(std::unique_ptr<gfx::GpuMemoryBuffer> gpuMemoryBuffer, GLuint imageId, GLuint textureId)
+    : m_gpuMemoryBuffer(std::move(gpuMemoryBuffer))
+    , m_imageId(imageId)
+    , m_textureId(textureId)
 {
-    DCHECK(imageId);
-    DCHECK(textureId);
+    DCHECK(m_gpuMemoryBuffer);
+    DCHECK(m_imageId);
+    DCHECK(m_textureId);
 }
 
-bool Canvas2DLayerBridge::ImageInfo::empty()
+Canvas2DLayerBridge::ImageInfo::~ImageInfo()
 {
-    return m_imageId == 0;
 }
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo() = default;
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) = default;
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink