ChangeLog

2012-06-20  Jeff Timanus  <twiz@chromium.org>

        [Chromium] Change implementing a fast-path for copying GPU-accelerated Canvas2D instances to WebGL textures.

        https://bugs.webkit.org/show_bug.cgi?id=86275

        This change adds the necessary plumbing to the various rendering contexts to copy the backing store texture of a Canvas2D

        instance to be copied to a WebGL texture.  The GL_CHROMIUM_copy_texture extension is necessary because the backing-store

        for a GPU-accelerated skia Canvas2D is normally in BGRA format, which is not supported by glCopyTexImage.

        Reviewed by NOBODY (OOPS!).

        * chromium/public/WebGraphicsContext3D.h:

        (WebGraphicsContext3D):

        (WebKit::WebGraphicsContext3D::copyTextureCHROMIUM):

2012-06-19  Tony Payne  <tpayne@chromium.org>

        Add monitor profile support for Win

120843

Source/Platform/chromium/public/WebGraphicsContext3D.h

@@public:

    virtual void getQueryivEXT(WGC3Denum target, WGC3Denum pname, WGC3Dint* params) { }

    virtual void getQueryObjectuivEXT(WebGLId query, WGC3Denum pname, WGC3Duint* params) { }

    // GL_CHROMIUM_copy_texture

    virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Duint sourceId,

                                     WGC3Duint destId, WGC3Dint level, WGC3Denum internalFormat) { }

    GrGLInterface* createGrGLInterface();

protected:

120101

Source/WebCore/ChangeLog

2012-06-20  Jeff Timanus  <twiz@chromium.org>

        [Chromium] Change implementing a fast-path for copying GPU-accelerated Canvas2D instances to WebGL textures.

        https://bugs.webkit.org/show_bug.cgi?id=86275

        This change adds the necessary plumbing to the various rendering contexts to copy the backing store texture of a Canvas2D

        instance to be copied to a WebGL texture.  The GL_CHROMIUM_copy_texture extension is necessary because the backing-store

        for a GPU-accelerated skia Canvas2D is normally in BGRA format, which is not supported by glCopyTexImage.

        Reviewed by NOBODY (OOPS!).

        Test: fast/canvas/webgl/*

        * html/canvas/WebGLRenderingContext.cpp:

        (WebCore):

        (WebCore::WebGLRenderingContext::texImage2D):

        * platform/chromium/support/Extensions3DChromium.cpp:

        (WebCore::Extensions3DChromium::copyTextureCHROMIUM):

        (WebCore):

        * platform/graphics/Extensions3D.h:

        (Extensions3D):

        * platform/graphics/ImageBuffer.cpp:

        (WebCore):

        (WebCore::ImageBuffer::copyToPlatformTexture):

        * platform/graphics/ImageBuffer.h:

        (WebCore):

        (ImageBuffer):

        * platform/graphics/chromium/Canvas2DLayerBridge.cpp:

        (WebCore::Canvas2DLayerBridge::backBufferTexture):

        (WebCore):

        * platform/graphics/chromium/Canvas2DLayerBridge.h:

        (Canvas2DLayerBridge):

        * platform/graphics/chromium/Extensions3DChromium.h:

        (Extensions3DChromium):

        * platform/graphics/opengl/Extensions3DOpenGL.cpp:

        (WebCore::Extensions3DOpenGL::copyTextureCHROMIUM):

        (WebCore):

        * platform/graphics/opengl/Extensions3DOpenGL.h:

        (Extensions3DOpenGL):

        * platform/graphics/qt/Extensions3DQt.cpp:

        (WebCore::Extensions3DQt::copyTextureCHROMIUM):

        (WebCore):

        * platform/graphics/qt/Extensions3DQt.h:

        (Extensions3DQt):

        * platform/graphics/skia/ImageBufferSkia.cpp:

        (WebCore::ImageBuffer::platformLayer):

        (WebCore):

        (WebCore::ImageBuffer::copyToPlatformTexture):

2012-06-20  Andrey Adaikin  <aandrey@chromium.org>

        Web Inspector: Allow module injections into the InjectedScript

120843

Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@void WebGLRenderingContext::texImage2D(G

        ec = SECURITY_ERR;

        return;

    }

    WebGLTexture* texture = validateTextureBinding("texImage2D", target, true);

    // If possible, copy from the canvas element directly to the texture

    // via the GPU, without a read-back to system memory.

    if (GraphicsContext3D::TEXTURE_2D == target && texture && type == texture->getType(target, level)) {

        ImageBuffer* buffer = canvas->buffer();

        if (buffer && buffer->copyToPlatformTexture(*m_context.get(), texture->object(), internalformat, m_unpackPremultiplyAlpha, m_unpackFlipY)) {

            texture->setLevelInfo(target, level, internalformat, canvas->width(), canvas->height(), type);

            cleanupAfterGraphicsCall(false);

            return;

        }

    }

    RefPtr<ImageData> imageData = canvas->getImageData();

    if (imageData)

        texImage2D(target, level, internalformat, format, type, imageData.get(), ec);

120101

Source/WebCore/platform/chromium/support/Extensions3DChromium.cpp

@@void Extensions3DChromium::getQueryObjec

    m_private->webContext()->getQueryObjectuivEXT(query, pname, params);

}

void Extensions3DChromium::copyTextureCHROMIUM(GC3Denum target, Platform3DObject sourceId, Platform3DObject destId, GC3Dint level, GC3Denum internalFormat)

{

    m_private->webContext()->copyTextureCHROMIUM(target, sourceId, destId, level, internalFormat);

}

204209} // namespace WebCore

120101

Source/WebCore/platform/graphics/Extensions3D.h

@@public:

    //   GL_OES_compressed_ETC1_RGB8_texture

    //   GL_IMG_texture_compression_pvrtc

    //   EXT_texture_filter_anisotropic

69 // GL_CHROMIUM_copy_texture

70 // GL_CHROMIUM_flipy

    // Takes full name of extension; for example,

    // "GL_EXT_texture_format_BGRA8888".

@@public:

        // GL_EXT_texture_filter_anisotropic

        TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE,

        MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF,

        // GL_CHROMIUM_flipy

        UNPACK_FLIP_Y_CHROMIUM = 0x9240,

        // GL_CHROMIUM_copy_texture

        UNPACK_PREMULTIPLY_ALPHA_CHROMIUM = 0x9241,

        UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM = 0x9242

    };

    // GL_ARB_robustness

@@public:

    // GL_ANGLE_translated_shader_source

    virtual String getTranslatedShaderSourceANGLE(Platform3DObject) = 0;

    // GL_CHROMIUM_copy_texture

    virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum) = 0;

};

} // namespace WebCore

120101

Source/WebCore/platform/graphics/ImageBuffer.cpp

@@PlatformLayer* ImageBuffer::platformLaye

}

#endif

#if !USE(SKIA)

bool ImageBuffer::copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, bool, bool)

{

    return false;

}

#endif

108115}

120101

Source/WebCore/platform/graphics/ImageBuffer.h

#include "GraphicsLayer.h"

#endif

#include "GraphicsTypes.h"

39#include "GraphicsTypes3D.h"

#include "IntSize.h"

#include "ImageBufferData.h"

#include <wtf/Forward.h>

@@namespace WebCore {

    class ImageData;

    class IntPoint;

    class IntRect;

55 class GraphicsContext3D;

    enum Multiply {

        Premultiplied,

@@namespace WebCore {

        PlatformLayer* platformLayer() const;

#endif

122 bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, bool, bool);

123

    private:

#if USE(CG)

        NativeImagePtr copyNativeImage(BackingStoreCopy = CopyBackingStore) const;

120101

Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp

@@void Canvas2DLayerBridge::contextAcquire

        m_layer->willModifyTexture();

}

unsigned Canvas2DLayerBridge::backBufferTexture()

{

    contextAcquired();

    if (m_canvas)

        m_canvas->flush();

    m_context->flush();

    return m_backBufferTexture;

}

158167}

159168

120101

Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.h

@@public:

    LayerChromium* layer() const;

    void contextAcquired();

65 unsigned backBufferTexture();

66

private:

    Canvas2DLayerBridge(PassRefPtr<GraphicsContext3D>, const IntSize&, DeferralMode, unsigned textureId);

120101

Source/WebCore/platform/graphics/chromium/Extensions3DChromium.h

@@public:

    void getQueryivEXT(GC3Denum, GC3Denum, GC3Dint*);

    void getQueryObjectuivEXT(Platform3DObject, GC3Denum, GC3Duint*);

    // GL_CHROMIUM_copy_texture

    void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);

private:

    // Instances of this class are strictly owned by the GraphicsContext3D implementation and do not

    // need to be instantiated by any other code.

120101

Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

@@String Extensions3DOpenGL::getTranslated

    // FIXME: implement this function and add GL_ANGLE_translated_shader_source in supports().

}

void Extensions3DOpenGL::copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum)

{

    // FIXME: implement this function and add GL_CHROMIUM_copy_texture in supports().

    return;

}

} // namespace WebCore

#endif // ENABLE(WEBGL)

120101

Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h

@@public:

    virtual GC3Dboolean isVertexArrayOES(Platform3DObject);

    virtual void bindVertexArrayOES(Platform3DObject);

    virtual String getTranslatedShaderSourceANGLE(Platform3DObject);

54 virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);

private:

    // This class only needs to be instantiated by GraphicsContext3D implementations.

120101

Source/WebCore/platform/graphics/qt/Extensions3DQt.cpp

@@String Extensions3DQt::getTranslatedShad

    return "";

}

void Extensions3DQt::copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum)

{

    return;

}

} // namespace WebCore

#endif // ENABLE(WEBGL)

120101

Source/WebCore/platform/graphics/qt/Extensions3DQt.h

@@public:

    virtual GC3Dboolean isVertexArrayOES(Platform3DObject);

    virtual void bindVertexArrayOES(Platform3DObject);

    virtual String getTranslatedShaderSourceANGLE(Platform3DObject);

49 virtual void copyTextureCHROMIUM(GC3Denum, Platform3DObject, Platform3DObject, GC3Dint, GC3Denum);

private:

    // This class only needs to be instantiated by GraphicsContext3D implementations.

120101

Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

#include "Base64.h"

#include "BitmapImage.h"

#include "BitmapImageSingleFrameSkia.h"

39#include "Extensions3D.h"

3940#include "GrContext.h"

4041#include "GraphicsContext.h"

42#include "GraphicsContext3D.h"

#include "ImageData.h"

#include "JPEGImageEncoder.h"

#include "MIMETypeRegistry.h"

@@PlatformLayer* ImageBuffer::platformLaye

    return m_data.m_layerBridge ? m_data.m_layerBridge->layer() : 0;

}

bool ImageBuffer::copyToPlatformTexture(GraphicsContext3D& context, Platform3DObject texture, GC3Denum internalFormat, bool premultiplyAlpha, bool flipY)

{

    if (!m_data.m_layerBridge || !platformLayer())

        return false;

    Platform3DObject sourceTexture = m_data.m_layerBridge->backBufferTexture();

    if (!context.makeContextCurrent())

        return false;

    Extensions3D* extensions = context.getExtensions();

    if (!extensions->supports("GL_CHROMIUM_copy_texture") || !extensions->supports("GL_CHROMIUM_flipy"))

        return false;

    // The canvas is stored in a premultiplied format, so unpremultiply if necessary.

    context.pixelStorei(Extensions3D::UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, !premultiplyAlpha);

    // The canvas is stored in an inverted position, so the flip semantics are reversed.

    context.pixelStorei(Extensions3D::UNPACK_FLIP_Y_CHROMIUM, !flipY);

    extensions->copyTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, sourceTexture, texture, 0, internalFormat);

    context.pixelStorei(Extensions3D::UNPACK_FLIP_Y_CHROMIUM, false);

    context.pixelStorei(Extensions3D::UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, false);

    return true;

}

void ImageBuffer::clip(GraphicsContext* context, const FloatRect& rect) const

{

    context->platformContext()->beginLayerClippedToImage(rect, this);

120101