mac: Use IOSurfaces in Canvas2DLayerBridge.

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 121 matching lines @@
     TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation", TRACE_EVENT_SCOPE_GLOBAL);
     startRecording();
 #ifndef NDEBUG
     canvas2DLayerBridgeInstanceCounter().increment();
 #endif
 }
 
 Canvas2DLayerBridge::~Canvas2DLayerBridge()
 {
     ASSERT(m_destructionInProgress);
+#if USE_IOSURFACE_FOR_2D_CANVAS
+    clearCHROMIUMImageCache();
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
+
     m_layer.clear();
     ASSERT(m_mailboxes.size() == 0);
 #ifndef NDEBUG
     canvas2DLayerBridgeInstanceCounter().decrement();
 #endif
 }
 
 void Canvas2DLayerBridge::startRecording()
 {
     ASSERT(m_isDeferralEnabled);
@@ skipping 42 matching lines @@
     // of the canvas would result in the canvas being accelerated. Presentation is assumed to be
     // a 'PreferAcceleration' operation.
     return shouldAccelerate(PreferAcceleration);
 }
 
 GLenum Canvas2DLayerBridge::getGLFilter()
 {
     return m_filterQuality == kNone_SkFilterQuality ? GL_NEAREST : GL_LINEAR;
 }
 
-Canvas2DLayerBridge::MailboxInfo& Canvas2DLayerBridge::createMailboxInfo()
+#if USE_IOSURFACE_FOR_2D_CANVAS
+bool Canvas2DLayerBridge::prepareIOSurfaceMailboxFromImage(SkImage* image, WebExternalTextureMailbox* 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())
+        return false;
+
+    GLuint imageTexture = skia::GrBackendObjectToGrGLTextureInfo(image->getTextureHandle(true))->fID;
+    context()->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();
+    info.m_mailbox.textureTarget = GC3D_TEXTURE_RECTANGLE_ARB;
+    context()->genMailboxCHROMIUM(info.m_mailbox.name);
+    context()->produceTextureDirectCHROMIUM(imageInfo.m_textureId, info.m_mailbox.textureTarget, info.m_mailbox.name);
+    info.m_mailbox.allowOverlay = true;
+
+    const WGC3Duint64 fenceSync = context()->insertFenceSyncCHROMIUM();
+    context()->flush();
+    info.m_mailbox.validSyncToken = context()->genSyncTokenCHROMIUM(fenceSync, info.m_mailbox.syncToken);
+
+    info.m_imageInfo = imageInfo;
+    *outMailbox = info.m_mailbox;
+
+    context()->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()
+{
+    if (!m_imageInfoCache.isEmpty()) {
+        Canvas2DLayerBridge::ImageInfo info = m_imageInfoCache.last();
+        m_imageInfoCache.removeLast();
+        return info;
+    }
+
+    WebGraphicsContext3D* webContext = context();
+    GLuint imageId = webContext->createGpuMemoryBufferImageCHROMIUM(m_size.width(), m_size.height(), GL_BGRA_EXT, GC3D_SCANOUT_CHROMIUM);
+    if (!imageId)
+        return Canvas2DLayerBridge::ImageInfo();
+
+    GLuint textureId= webContext->createTexture();
+    if (!textureId) {
+        webContext->destroyImageCHROMIUM(imageId);
+        return Canvas2DLayerBridge::ImageInfo();
+    }
+
+    GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
+    webContext->bindTexture(target, textureId);
+    webContext->texParameteri(target, GL_TEXTURE_MAG_FILTER, getGLFilter());
+    webContext->texParameteri(target, GL_TEXTURE_MIN_FILTER, getGLFilter());
+    webContext->texParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    webContext->texParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    webContext->bindTexImage2DCHROMIUM(target, imageId);
+
+    return Canvas2DLayerBridge::ImageInfo(imageId, textureId);
+}
+
+void Canvas2DLayerBridge::deleteCHROMIUMImage(ImageInfo info)
+{
+    WebGraphicsContext3D* webContext = context();
+    if (webContext->isContextLost())
+        return;
+
+    GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
+    webContext->bindTexture(target, info.m_textureId);
+    webContext->releaseTexImage2DCHROMIUM(target, info.m_imageId);
+    webContext->destroyImageCHROMIUM(info.m_imageId);
+    webContext->deleteTexture(info.m_textureId);
+    webContext->bindTexture(target, 0);
+
+    resetSkiaTextureBinding();
+}
+
+void Canvas2DLayerBridge::clearCHROMIUMImageCache()

[Ken Russell (switch to Gerrit), 2016/03/10 01:58:04]

This must be called when the canvas is resized, correct? If so, where does that
happen? Is there a test for that (that a canvas drawn with one size, and then
re-drawn with another size, renders correctly)?

[erikchen, 2016/03/10 02:03:37]

I am under the impression that resizing happens in another location, and
presumably involves destroying this instance of Canvas2DLayerBridge. Note that
my CL adds the "const" qualifier to the member m_size.

[Ken Russell (switch to Gerrit), 2016/03/10 02:59:41]

OK, yes, it looks like HTMLCanvasElement::m_imageBuffer is cleared indirectly
from HTMLCanvasElement::setSurfaceSize, called from HTMLCanvasElement::reset,
called from HTMLCanvasElement::setSize -- and the ImageBuffer indirectly owns
the Canvas2DLayerBridge.

+{
+    for (const auto& it : m_imageInfoCache) {
+        deleteCHROMIUMImage(it);
+    }
+    m_imageInfoCache.clear();
+}
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
+
+void Canvas2DLayerBridge::createMailboxInfo()
 {
     MailboxInfo tmp;
     tmp.m_parentLayerBridge = this;
     m_mailboxes.prepend(tmp);
-    MailboxInfo& mailboxInfo = m_mailboxes.first();
-    return mailboxInfo;
 }
 
 bool Canvas2DLayerBridge::prepareMailboxFromImage(PassRefPtr<SkImage> image, WebExternalTextureMailbox* outMailbox)
 {
-    MailboxInfo& mailboxInfo = createMailboxInfo();
+    createMailboxInfo();
+    MailboxInfo& mailboxInfo = m_mailboxes.first();
     mailboxInfo.m_mailbox.nearestNeighbor = getGLFilter() == GL_NEAREST;
-    mailboxInfo.m_image = image;
 
     GrContext* grContext = m_contextProvider->grContext();
-    if (!grContext)
+    if (!grContext) {
+        mailboxInfo.m_image = image;
         return true; // for testing: skip gl stuff when using a mock graphics context.
+    }
+
+#if USE_IOSURFACE_FOR_2D_CANVAS
+    if (RuntimeEnabledFeatures::canvas2dImageChromiumEnabled()) {
+        if (prepareIOSurfaceMailboxFromImage(image.get(), outMailbox))
+            return true;
+        // Note: if IOSurface backed texture creation failed we fall back to the
+        // non-IOSurface path.
+    }
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
+
+    mailboxInfo.m_image = image;
 
     if (RuntimeEnabledFeatures::forceDisable2dCanvasCopyOnWriteEnabled())
         m_surface->notifyContentWillChange(SkSurface::kRetain_ContentChangeMode);
 
     // Need to flush skia's internal queue because texture is about to be accessed directly
     grContext->flush();
 
     // Because of texture sharing with the compositor, we must invalidate
     // the state cached in skia so that the deferred copy on write
     // in SkSurface_Gpu does not make any false assumptions.
@@ skipping 32 matching lines @@
     }
     webContext->bindTexture(GL_TEXTURE_2D, 0);
     // Because we are changing the texture binding without going through skia,
     // we must dirty the context.
     grContext->resetContext(kTextureBinding_GrGLBackendState);
 
     *outMailbox = mailboxInfo.m_mailbox;
     return true;
 }
 
+void Canvas2DLayerBridge::resetSkiaTextureBinding()
+{
+    GrContext* grContext = m_contextProvider->grContext();
+    if (grContext)
+        grContext->resetContext(kTextureBinding_GrGLBackendState);
+}
+
 static void hibernateWrapper(WeakPtr<Canvas2DLayerBridge> bridge, double /*idleDeadline*/)
 {
     if (bridge) {
         bridge->hibernate();
     } else {
         Canvas2DLayerBridge::Logger localLogger;
         localLogger.reportHibernationEvent(Canvas2DLayerBridge::HibernationAbortedDueToDestructionWhileHibernatePending);
     }
 }
 
@@ skipping 43 matching lines @@
     // case because flushRecordingOnly should only fail it it fails to allocate
     // a surface, and we have an early exit at the top of this function for when
     // 'this' does not already have a surface.
     ASSERT(!m_haveRecordedDrawCommands);
     SkPaint copyPaint;
     copyPaint.setXfermodeMode(SkXfermode::kSrc_Mode);
     m_surface->draw(tempHibernationSurface->getCanvas(), 0, 0, &copyPaint); // GPU readback
     m_hibernationImage = adoptRef(tempHibernationSurface->newImageSnapshot());
     m_surface.clear(); // destroy the GPU-backed buffer
     m_layer->clearTexture();
+#if USE_IOSURFACE_FOR_2D_CANVAS
+    clearCHROMIUMImageCache();
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
     m_logger->didStartHibernating();
-
 }
 
 void Canvas2DLayerBridge::reportSurfaceCreationFailure()
 {
     if (!m_surfaceCreationFailedAtLeastOnce) {
         // Only count the failure once per instance so that the histogram may
         // reflect the proportion of Canvas2DLayerBridge instances with surface
         // allocation failures.
         CanvasMetrics::countCanvasContextUsage(CanvasMetrics::GPUAccelerated2DCanvasSurfaceCreationFailed);
         m_surfaceCreationFailedAtLeastOnce = true;
@@ skipping 367 matching lines @@
         --releasedMailboxInfo;
         if (nameEquals(releasedMailboxInfo->m_mailbox, mailbox)) {
             break;
         }
         ASSERT(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
+            ASSERT(releasedMailboxInfo->m_imageInfo.empty());
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
             if (mailbox.validSyncToken) {
                 context()->waitSyncTokenCHROMIUM(mailbox.syncToken);
             }
             GrTexture* texture = releasedMailboxInfo->m_image->getTexture();
             if (texture) {
                 if (lostResource) {
                     texture->abandon();
                 } else {
                     texture->textureParamsModified();
                 }
             }
         }
+
+#if USE_IOSURFACE_FOR_2D_CANVAS
+        if (!releasedMailboxInfo->m_imageInfo.empty() && !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;
     }
 
     // The destruction of 'releasedMailboxInfo' will:
@@ skipping 87 matching lines @@
     // parameters.
     getOrCreateSurface()->notifyContentWillChange(SkSurface::kRetain_ContentChangeMode);
     return adoptRef(m_surface->newImageSnapshot());
 }
 
 void Canvas2DLayerBridge::willOverwriteCanvas()
 {
     skipQueuedDrawCommands();
 }
 
+#if USE_IOSURFACE_FOR_2D_CANVAS
+Canvas2DLayerBridge::ImageInfo::ImageInfo(GLuint imageId, GLuint textureId) : m_imageId(imageId), m_textureId(textureId)
+{
+    ASSERT(imageId);
+    ASSERT(textureId);
+}
+
+bool Canvas2DLayerBridge::ImageInfo::empty()
+{
+    return m_imageId == 0;
+}
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
+
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other)
 {
     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox));
     m_image = other.m_image;
     m_parentLayerBridge = other.m_parentLayerBridge;
+#if USE_IOSURFACE_FOR_2D_CANVAS
+    m_imageInfo = other.m_imageInfo;
+#endif // USE_IOSURFACE_FOR_2D_CANVAS
 }
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink