WebCore/ChangeLog

112010-08-06 James Robinson <jamesr@chromium.org>

22

        Reviewed by NOBODY (OOPS!).

        [chromium] Add a PrepareTextureCallback to the chromium canvas layer compositor to upload mixed-mode results before compositing

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

        When compositing an accelerated canvas that is using both hardware and software drawing,

        we need a callback before compositing the layer to make sure that we upload any software

        drawn results to the texture.  This will go away as soon as implement all draw calls

        in hardware.

        To test, run any canvas demo that runs in mixed mode and verifies that the software results

        always show up.

        * platform/graphics/chromium/CanvasLayerChromium.cpp:

        (WebCore::CanvasLayerChromium::updateTextureContents):

        * platform/graphics/chromium/CanvasLayerChromium.h:

        (WebCore::CanvasLayerChromium::setPrepareTextureCallback):

        * platform/graphics/skia/PlatformContextSkia.cpp:

        (WebCore::PrepareTextureCallbackImpl::create):

        (WebCore::PrepareTextureCallbackImpl::willPrepareTexture):

        (WebCore::PrepareTextureCallbackImpl::PrepareTextureCallbackImpl):

        (WebCore::PlatformContextSkia::setGraphicsContext3D):

2010-08-06  James Robinson  <jamesr@chromium.org>

        Reviewed by Simon Fraser.

        Accelerated 2d canvases should get compositing layers

WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp

@@void CanvasLayerChromium::updateTextureContents(unsigned textureId)

    }

    // Update the contents of the texture used by the compositor.

    if (m_contentsDirty) {

78 if (m_prepareTextureCallback)

79 m_prepareTextureCallback->willPrepareTexture();

        m_context->prepareTexture();

        m_contentsDirty = false;

    }

WebCore/platform/graphics/chromium/CanvasLayerChromium.h

@@public:

    static void setShaderProgramId(unsigned shaderProgramId) { m_shaderProgramId = shaderProgramId; }

    class PrepareTextureCallback : public Noncopyable {

    public:

        virtual void willPrepareTexture() = 0;

    };

    void setPrepareTextureCallback(PassOwnPtr<PrepareTextureCallback> callback) { m_prepareTextureCallback = callback; }

private:

    explicit CanvasLayerChromium(GraphicsLayerChromium* owner);

    GraphicsContext3D* m_context;

    unsigned m_textureId;

    bool m_textureChanged;

68 OwnPtr<PrepareTextureCallback> m_prepareTextureCallback;

    static unsigned m_shaderProgramId;

};

WebCore/platform/graphics/skia/PlatformContextSkia.cpp

#include "PlatformContextSkia.h"

#include "AffineTransform.h"

36#include "CanvasLayerChromium.h"

#include "GraphicsContext.h"

#include "ImageBuffer.h"

#include "NativeImageSkia.h"

@@PlatformContextSkia::PlatformContextSkia(skia::PlatformCanvas* canvas)

PlatformContextSkia::~PlatformContextSkia()

{

#if USE(GLES2_RENDERING)

    if (m_gpuCanvas) {

        CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(m_gpuCanvas->context()->platformLayer());

        layer->setPrepareTextureCallback(0);

    }

#endif

}

void PlatformContextSkia::setCanvas(skia::PlatformCanvas* canvas)

@@void PlatformContextSkia::applyAntiAliasedClipPaths(WTF::Vector<SkPath>& paths)

#if USE(GLES2_RENDERING)

class PrepareTextureCallbackImpl : public CanvasLayerChromium::PrepareTextureCallback {

public:

    static PassOwnPtr<PrepareTextureCallbackImpl> create(PlatformContextSkia* pcs)

    {

        return new PrepareTextureCallbackImpl(pcs);

    }

    virtual void willPrepareTexture()

    {

        m_pcs->prepareForHardwareDraw();

    }

private:

    explicit PrepareTextureCallbackImpl(PlatformContextSkia* pcs) : m_pcs(pcs) {}

    PlatformContextSkia* m_pcs;

};

void PlatformContextSkia::setGraphicsContext3D(GraphicsContext3D* context, const WebCore::IntSize& size)

{

    m_useGPU = true;

    m_gpuCanvas = new GLES2Canvas(context, size);

708 CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(context->platformLayer());

709 layer->setPrepareTextureCallback(PrepareTextureCallbackImpl::create(this));

}

void PlatformContextSkia::prepareForSoftwareDraw() const