Share Group plumbing in Blink; Remove WebGL from default share group

Source/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. 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
@@ skipping 29 matching lines @@
 #include "platform/graphics/GraphicsTypes3D.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/graphics/gpu/DrawingBuffer.h"
 #include "platform/graphics/gpu/Extensions3DUtil.h"
 #include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/image-encoders/skia/JPEGImageEncoder.h"
 #include "platform/image-encoders/skia/PNGImageEncoder.h"
 #include "platform/image-encoders/skia/WEBPImageEncoder.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebExternalTextureMailbox.h"
 #include "public/platform/WebGraphicsContext3D.h"
 #include "public/platform/WebGraphicsContext3DProvider.h"
 #include "third_party/skia/include/effects/SkTableColorFilter.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/WTFString.h"
 
 using namespace std;
 
 namespace WebCore {
@@ skipping 71 matching lines @@
 blink::WebLayer* ImageBuffer::platformLayer() const
 {
     return m_surface->layer();
 }
 
 bool ImageBuffer::copyToPlatformTexture(blink::WebGraphicsContext3D* context, Platform3DObject texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)
 {
     if (!m_surface->isAccelerated() || !platformLayer() || !isValid())
         return false;
 
+    if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, destType, level))
+        return false;
+
+    OwnPtr<blink::WebGraphicsContext3DProvider> provider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
+    if (!provider)
+        return false;
+    blink::WebGraphicsContext3D* sharedContext = provider->context3d();
+    if (!sharedContext || !sharedContext->makeContextCurrent())
+        return false;
+
+    GLint boundTexture = 0;
+    sharedContext->getIntegerv(GL_TEXTURE_BINDING_2D, &boundTexture);

[Ken Russell (switch to Gerrit), 2014/03/12 21:23:38]

Get calls are expensive in the command buffer. Is it really necessary to
preserve the texture bound to the current active texture unit in the shared
context? If it's used in a stateless fashion by the calling code (probably Blink
and Ganesh?) then this save/restore can be skipped. In that case,
ImageBuffer::copyToPlatformTexture should document that it destroys the
TEXTURE_2D binding of the active texture unit of the context provided by Blink's
SharedOffscreenGraphicsContext3DProvider.

+
+    OwnPtr<blink::WebExternalTextureMailbox> mailbox = adoptPtr(new blink::WebExternalTextureMailbox);
+
+    // Contexts may be in a different share group. We must transfer the texture through a mailbox first
+    sharedContext->genMailboxCHROMIUM(mailbox->name);
+    sharedContext->bindTexture(GL_TEXTURE_2D, getBackingTexture());
+    sharedContext->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox->name);
+    sharedContext->bindTexture(GL_TEXTURE_2D, boundTexture);
+    sharedContext->flush();
+
+    mailbox->syncPoint = sharedContext->insertSyncPoint();
+
     if (!context->makeContextCurrent())
         return false;
 
-    if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, destType, level))
-        return false;
+    Platform3DObject sourceTexture = context->createTexture();
+
+    context->getIntegerv(GL_TEXTURE_BINDING_2D, &boundTexture);

[Ken Russell (switch to Gerrit), 2014/03/12 21:23:38]

The only caller of ImageBuffer::copyToPlatformTexture is
WebGLRenderingContextBase, and it should have enough information to restore the
TEXTURE_2D binding for the current texture unit. I think the documentation for
ImageBuffer::copyToPlatformTexture should clearly state that it destroys the
TEXTURE_2D binding for the active texture unit of the passed context, and then
the calling code should restore it. That will avoid the get query here.

+    context->bindTexture(GL_TEXTURE_2D, sourceTexture);
+
+    context->waitSyncPoint(mailbox->syncPoint);
+    context->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox->name);
 
     // The canvas is stored in a premultiplied format, so unpremultiply if necessary.
     context->pixelStorei(GC3D_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, !premultiplyAlpha);
 
     // The canvas is stored in an inverted position, so the flip semantics are reversed.
     context->pixelStorei(GC3D_UNPACK_FLIP_Y_CHROMIUM, !flipY);
-    context->copyTextureCHROMIUM(GL_TEXTURE_2D, getBackingTexture(), texture, level, internalFormat, destType);
+    context->copyTextureCHROMIUM(GL_TEXTURE_2D, sourceTexture, texture, level, internalFormat, destType);
 
     context->pixelStorei(GC3D_UNPACK_FLIP_Y_CHROMIUM, false);
     context->pixelStorei(GC3D_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, false);
+
+    context->bindTexture(GL_TEXTURE_2D, boundTexture);

[Ken Russell (switch to Gerrit), 2014/03/12 21:23:38]

In order to effectively delete sourceTexture below, this could bind NULL.

+    context->deleteTexture(sourceTexture);
+
     context->flush();
+    sharedContext->waitSyncPoint(context->insertSyncPoint());
+
     return true;
 }
 
 static bool drawNeedsCopy(GraphicsContext* src, GraphicsContext* dst)
 {
     ASSERT(dst);
     return (src == dst);
 }
 
 Platform3DObject ImageBuffer::getBackingTexture()
@@ skipping 230 matching lines @@
     if (!encodeImage(imageData, mimeType, quality, &encodedImage))
         return "data:,";
 
     Vector<char> base64Data;
     base64Encode(encodedImage, base64Data);
 
     return "data:" + mimeType + ";base64," + base64Data;
 }
 
 } // namespace WebCore