ChangeLog

112012-12-27 Huang Dongsung <luxtella@company100.net>

22

        [TexMap] Refactor code related to debug border and repaint count. [1/2]

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

        Reviewed by NOBODY (OOPS!).

        Introduce TextureMapperPaintParameters to reduce the number of parameters of

        TextureMapperPlatformLayer::paintToTextureMapper().

        Now we can easily add new arguments into TextureMapperPlatformLayer::paintToTextureMapper()

        when needed.

        No new tests. Refactoring only.

        * platform/graphics/cairo/GraphicsContext3DPrivate.cpp:

        (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):

        * platform/graphics/cairo/GraphicsContext3DPrivate.h:

        (GraphicsContext3DPrivate):

        * platform/graphics/efl/GraphicsContext3DPrivate.cpp:

        (GraphicsContext3DPrivate::paintToTextureMapper):

        * platform/graphics/efl/GraphicsContext3DPrivate.h:

        (GraphicsContext3DPrivate):

        * platform/graphics/qt/GraphicsContext3DQt.cpp:

        (GraphicsContext3DPrivate):

        (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):

        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:

        (WebCore::MediaPlayerPrivateQt::paintToTextureMapper):

        * platform/graphics/qt/MediaPlayerPrivateQt.h:

        (MediaPlayerPrivateQt):

        * platform/graphics/texmap/TextureMapperBackingStore.cpp:

        (WebCore::TextureMapperSurfaceBackingStore::paintToTextureMapper):

        (WebCore::TextureMapperTiledBackingStore::paintToTextureMapper):

        * platform/graphics/texmap/TextureMapperBackingStore.h:

        (TextureMapperBackingStore):

        (TextureMapperSurfaceBackingStore):

        (TextureMapperTiledBackingStore):

        * platform/graphics/texmap/TextureMapperLayer.cpp:

        (WebCore::TextureMapperLayer::paintSelf):

        * platform/graphics/texmap/TextureMapperPlatformLayer.h:

        (TextureMapperPaintParameters):

        (WebCore::TextureMapperPaintParameters::TextureMapperPaintParameters):

        (TextureMapperPlatformLayer):

2012-12-27  Huang Dongsung  <luxtella@company100.net>

        [TexMap] Use a premuliplied color in TextureMapperGL.

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

Source/WebKit2/ChangeLog

2012-12-27  Huang Dongsung  <luxtella@company100.net>

        [TexMap] Refactor code related to debug border and repaint count. [1/2]

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

        Reviewed by NOBODY (OOPS!).

        This patch changes the signature of TextureMapperPlatformLayer::paintToTextureMapper()

        so CoordinatedBackingStore is also changed.

        * UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp:

        (WebKit::CoordinatedBackingStore::paintTilesToTextureMapper):

        (WebKit::CoordinatedBackingStore::paintToTextureMapper):

        * UIProcess/CoordinatedGraphics/CoordinatedBackingStore.h:

        (CoordinatedBackingStore):

2012-12-26  Csaba Osztrogonác  <ossy@webkit.org>

        Unreviewed Xmas buildfix after r138479.

Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp

@@PlatformGraphicsContext3D GraphicsContext3DPrivate::platformContext()

}

#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)

81 void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const T~~ransformationMatrix& matrix, float opacity, BitmapT~~exture* mask)

81void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TextureMapperPaintParameters& parameters)

{

    if (!m_glContext)

        return;

@@void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper

    if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode) {

        GraphicsContext* context = textureMapper->graphicsContext();

        context->save();

94 context->platformContext()->setGlobalAlpha(opacity);

94 context->platformContext()->setGlobalAlpha(parameters.opacity);

        const int height = m_context->m_currentHeight;

        const int width = m_context->m_currentWidth;

@@void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper

        context->translate(0, height);

        context->scale(FloatSize(1, -1));

108 context->concatCTM(matrix.toAffineTransform());

108 context->concatCTM(parameters.modelViewMatrix.toAffineTransform());

        m_context->readRenderingResults(pixels.get(), totalBytes);

@@void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper

    TextureMapperGL* texmapGL = static_cast<TextureMapperGL*>(textureMapper);

    TextureMapperGL::Flags flags = TextureMapperGL::ShouldFlipTexture | (m_context->m_attrs.alpha ? TextureMapperGL::ShouldBlend : 0);

    IntSize textureSize(m_context->m_currentWidth, m_context->m_currentHeight);

145 texmapGL->drawTexture(m_context->m_texture, flags, textureSize, targetRect, matrix, opacity, mask);

145 texmapGL->drawTexture(m_context->m_texture, flags, textureSize, targetRect, parameters.modelViewMatrix, parameters.opacity, parameters.mask);

#endif // USE(ACCELERATED_COMPOSITING_GL)

}

#endif // USE(ACCELERATED_COMPOSITING)

Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.h

@@public:

    GraphicsContext3D::RenderStyle renderStyle() { return m_renderStyle; }

#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)

47 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const T~~ransformationMatrix&, float opacity, BitmapT~~exture* mask);

47 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const TextureMapperPaintParameters&);

#endif

private:

Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp

@@bool GraphicsContext3DPrivate::makeContextCurrent()

}

#if USE(TEXTURE_MAPPER_GL)

119 void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper*, const FloatRect& /* target */, const T~~ransformationMatrix&, float /* opacity */, BitmapT~~exture~~* /*~~ ma~~sk */~~)

119void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper*, const FloatRect& /* target */, const TextureMapperPaintParameters&)

{

    notImplemented();

}

Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h

@@public:

    PlatformLayer* platformLayer() const;

#endif

#if USE(TEXTURE_MAPPER_GL)

54 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const T~~ransformationMatrix&, float opacity, BitmapT~~exture* mask);

54 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const TextureMapperPaintParameters&);

#endif

#if USE(GRAPHICS_SURFACE)

    virtual IntSize platformLayerSize() const;

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

@@public:

    ~GraphicsContext3DPrivate();

#if USE(ACCELERATED_COMPOSITING)

68 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const T~~ransformationMatrix&, float opacity, BitmapT~~exture* mask);

68 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const TextureMapperPaintParameters&);

#endif

#if USE(GRAPHICS_SURFACE)

    virtual IntSize platformLayerSize() const;

@@static inline quint32 swapBgrToRgb(quint32 pixel)

}

#if USE(ACCELERATED_COMPOSITING)

211 void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const T~~ransformationMatrix& matrix, float opacity, BitmapT~~exture* mask)

211void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TextureMapperPaintParameters& parameters)

{

    m_context->markLayerComposited();

    blitMultisampleFramebufferAndRestoreContext();

@@void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper

        currentContext->makeCurrent(currentSurface);

        TextureMapperGL* texmapGL = static_cast<TextureMapperGL*>(textureMapper);

233 m_graphicsSurface->paintToTextureMapper(texmapGL, targetRect, matrix, opacity, mask);

233 m_graphicsSurface->paintToTextureMapper(texmapGL, targetRect, parameters.modelViewMatrix, parameters.opacity, parameters.mask);

#endif

        return;

    }

@@void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper

    GraphicsContext* context = textureMapper->graphicsContext();

    QPainter* painter = context->platformContext();

    painter->save();

241 painter->setTransform(matrix);

242 painter->setOpacity(opacity);

241 painter->setTransform(parameters.modelViewMatrix);

242 painter->setOpacity(parameters.opacity);

    const int height = m_context->m_currentHeight;

    const int width = m_context->m_currentWidth;

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

@@void MediaPlayerPrivateQt::paintCurrentFrameInContext(GraphicsContext* context,

}

#if USE(ACCELERATED_COMPOSITING)

648 void MediaPlayerPrivateQt::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const T~~ransformationMatrix& matrix, float opacity, BitmapT~~exture*)

648void MediaPlayerPrivateQt::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TextureMapperPaintParameters&)

{

}

#endif

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

@@public:

    virtual void acceleratedRenderingStateChanged() { }

    // Const-casting here is safe, since all of TextureMapperPlatformLayer's functions are const.g

    virtual PlatformLayer* platformLayer() const { return 0; }

112 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& targetRect, const T~~ransformationMatrix&, float opacity, BitmapT~~exture* mask);

112 virtual void paintToTextureMapper(TextureMapper*, const FloatRect& targetRect, const TextureMapperPaintParameters&);

#endif

    virtual PlatformMedia platformMedia() const;

Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp

@@PassRefPtr<BitmapTexture> TextureMapperSurfaceBackingStore::texture() const

    return emptyTexture;

}

55 void TextureMapperSurfaceBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const T~~ransformationMatrix& transform, float opacity, BitmapT~~exture* mask)

55void TextureMapperSurfaceBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TextureMapperPaintParameters& parameters)

5656{

5757 if (m_graphicsSurface)

58 m_graphicsSurface->paintToTextureMapper(textureMapper, targetRect, ~~transform~~, opacity, mask);

58 m_graphicsSurface->paintToTextureMapper(textureMapper, targetRect, parameters.modelViewMatrix, parameters.opacity, parameters.mask);

}

#endif

@@unsigned TextureMapperBackingStore::calculateExposedTileEdges(const FloatRect& t

    return exposedEdges;

}

136 void TextureMapperTiledBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const T~~ransformationMatrix& transform, float opacity, BitmapT~~exture* mask)

136void TextureMapperTiledBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TextureMapperPaintParameters& parameters)

137137{

138138 updateContentsFromImageIfNeeded(textureMapper);

139 TransformationMatrix adjustedTransform = ~~transform~~;

139 TransformationMatrix adjustedTransform = parameters.modelViewMatrix;

140140 adjustedTransform.multiply(TransformationMatrix::rectToRect(rect(), targetRect));

141141 for (size_t i = 0; i < m_tiles.size(); ++i) {

142 m_tiles[i].paint(textureMapper, adjustedTransform, opacity, mask, calculateExposedTileEdges(rect(), m_tiles[i].rect()));

142 m_tiles[i].paint(textureMapper, adjustedTransform, parameters.opacity, parameters.mask, calculateExposedTileEdges(rect(), m_tiles[i].rect()));

        if (m_drawsDebugBorders)

            textureMapper->drawBorder(m_debugBorderColor, m_debugBorderWidth, m_tiles[i].rect(), adjustedTransform);

    }

Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h

@@class GraphicsLayer;

class TextureMapperBackingStore : public TextureMapperPlatformLayer, public RefCounted<TextureMapperBackingStore> {

public:

    virtual PassRefPtr<BitmapTexture> texture() const = 0;

42 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const T~~ransformationMatrix&, float, BitmapT~~exture*) = 0;

42 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TextureMapperPaintParameters&) = 0;

    virtual ~TextureMapperBackingStore() { }

protected:

@@public:

    void setGraphicsSurface(PassRefPtr<GraphicsSurface>);

    void swapBuffersIfNeeded(uint32_t frontBuffer);

    virtual PassRefPtr<BitmapTexture> texture() const;

56 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const T~~ransformationMatrix&, float, BitmapT~~exture*);

56 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TextureMapperPaintParameters&);

    virtual ~TextureMapperSurfaceBackingStore() { }

private:

@@public:

    virtual ~TextureMapperTiledBackingStore() { }

    virtual PassRefPtr<BitmapTexture> texture() const OVERRIDE;

96 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const T~~ransformationMatrix&, float, BitmapT~~exture*) OVERRIDE;

96 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TextureMapperPaintParameters&) OVERRIDE;

    void updateContents(TextureMapper*, Image*, const FloatSize&, const IntRect&, BitmapTexture::UpdateContentsFlag);

    void updateContents(TextureMapper*, GraphicsLayer*, const FloatSize&, const IntRect&, BitmapTexture::UpdateContentsFlag);

Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@void TextureMapperLayer::paintSelf(const TextureMapperPaintOptions& options)

    transform.multiply(options.transform);

    transform.multiply(m_effectiveTransform.combined());

118 float opacity = options.opacity;

119 RefPtr<BitmapTexture> mask = options.mask;

    TextureMapperPaintParameters parameters;

    parameters.modelViewMatrix = transform;

    parameters.opacity = options.opacity;

    parameters.mask = options.mask.get();

    if (m_state.solidColor.isValid() && !m_state.contentsRect.isEmpty()) {

        if (!m_state.solidColor.alpha())

@@void TextureMapperLayer::paintSelf(const TextureMapperPaintOptions& options)

        Color color = m_state.solidColor;

        float r, g, b, a;

        color.getRGBA(r, g, b, a);

128 color = Color(r * opacity, g * opacity, b * opacity, a * opacity);

129 options.textureMapper->drawSolidColor(m_state.contentsRect, ~~transform~~, color);

130 color = Color(r * parameters.opacity, g * parameters.opacity, b * parameters.opacity, a * parameters.opacity);

131 options.textureMapper->drawSolidColor(m_state.contentsRect, parameters.modelViewMatrix, color);

        return;

    }

    if (m_backingStore) {

        ASSERT(m_state.drawsContent && m_state.contentsVisible && !m_state.size.isEmpty());

        ASSERT(!layerRect().isEmpty());

136 m_backingStore->paintToTextureMapper(options.textureMapper, layerRect(), t~~ransform, opacity, mask.get()~~);

138 m_backingStore->paintToTextureMapper(options.textureMapper, layerRect(), parameters);

    }

    if (m_contentsLayer) {

        ASSERT(!layerRect().isEmpty());

141 m_contentsLayer->paintToTextureMapper(options.textureMapper, m_state.contentsRect, t~~ransform, opacity, mask.get()~~);

143 m_contentsLayer->paintToTextureMapper(options.textureMapper, m_state.contentsRect, parameters);

    }

}

Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h

#include "GraphicsSurface.h"

#endif

27#include "TextureMapper.h"

#include "TransformationMatrix.h"

namespace WebCore {

31 class TextureMapper;

32 class BitmapTexture;

class TextureMapperPaintParameters {

public:

    TransformationMatrix modelViewMatrix;

    float opacity;

    BitmapTexture* mask;

    TextureMapperPaintParameters()

        : opacity(1)

        , mask(0)

    { }

};

class TextureMapperPlatformLayer {

public:

    virtual ~TextureMapperPlatformLayer() { }

37 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const T~~ransformationMatrix& modelViewMatrix = TransformationMatrix(), float opacity = 1.0, BitmapT~~exture* ma~~sk = 0~~) = 0;

47 virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TextureMapperPaintParameters&) = 0;

    virtual void swapBuffers() { }

#if USE(GRAPHICS_SURFACE)

    virtual IntSize platformLayerSize() const { return IntSize(); }

Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.cpp

@@static bool shouldShowTileDebugVisuals()

    return false;

}

122 void CoordinatedBackingStore::paintTilesToTextureMapper(Vector<TextureMapperTile*>& tiles, TextureMapper* textureMapper, const T~~ransformationMatrix& transform, float opacity, BitmapT~~exture* mask, const FloatRect& rect)

122void CoordinatedBackingStore::paintTilesToTextureMapper(Vector<TextureMapperTile*>& tiles, TextureMapper* textureMapper, const TextureMapperPaintParameters& parameters, const FloatRect& rect)

{

    for (size_t i = 0; i < tiles.size(); ++i) {

        TextureMapperTile* tile = tiles[i];

126 tile->paint(textureMapper, ~~transform~~, opacity, mask, calculateExposedTileEdges(rect, tile->rect()));

126 tile->paint(textureMapper, parameters.modelViewMatrix, parameters.opacity, parameters.mask, calculateExposedTileEdges(rect, tile->rect()));

        static bool shouldDebug = shouldShowTileDebugVisuals();

        if (!shouldDebug)

            continue;

131 textureMapper->drawBorder(Color(0xFF, 0, 0), 2, tile->rect(), ~~transform~~);

132 textureMapper->drawRepaintCounter(static_cast<CoordinatedBackingStoreTile*>(tile)->repaintCount(), 8, tile->rect().location(), ~~transform~~);

131 textureMapper->drawBorder(Color(0xFF, 0, 0), 2, tile->rect(), parameters.modelViewMatrix);

132 textureMapper->drawRepaintCounter(static_cast<CoordinatedBackingStoreTile*>(tile)->repaintCount(), 8, tile->rect().location(), parameters.modelViewMatrix);

    }

}

136 void CoordinatedBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const T~~ransformationMatrix& transform, float opacity, BitmapT~~exture* mask)

136void CoordinatedBackingStore::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TextureMapperPaintParameters& parameters)

{

    if (m_tiles.isEmpty())

        return;

@@void CoordinatedBackingStore::paintToTextureMapper(TextureMapper* textureMapper,

        // Only show the previous tile if the opacity is high, otherwise effect looks like a bug.

        // We show the previous-scale tile anyway if it doesn't intersect with any current-scale tile.

161 if (opacity < 0.95 && coveredRect.intersects(tile.rect()))

161 if (parameters.opacity < 0.95 && coveredRect.intersects(tile.rect()))

            continue;

        previousTilesToPaint.append(&tile);

    }

    FloatRect rectOnContents(FloatPoint::zero(), m_size);

168 T~~ransformationMatrix~~ adjustedT~~ransform~~ = t~~ransform~~;

168 TextureMapperPaintParameters adjustedParameters = parameters;

169169 // targetRect is on the contents coordinate system, so we must compare two rects on the contents coordinate system.

170170 // See TiledBackingStore.

171 adjustedT~~ran~~sform.multiply(TransformationMatrix::rectToRect(rectOnContents, targetRect));

171 adjustedParameters.modelViewMatrix.multiply(TransformationMatrix::rectToRect(rectOnContents, targetRect));

172172

173 paintTilesToTextureMapper(previousTilesToPaint, textureMapper, adjustedT~~ransform, opacity, mask~~, rectOnContents);

174 paintTilesToTextureMapper(tilesToPaint, textureMapper, adjustedT~~ransform, opacity, mask~~, rectOnContents);

173 paintTilesToTextureMapper(previousTilesToPaint, textureMapper, adjustedParameters, rectOnContents);

174 paintTilesToTextureMapper(tilesToPaint, textureMapper, adjustedParameters, rectOnContents);

}

void CoordinatedBackingStore::commitTileOperations(TextureMapper* textureMapper)

Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedBackingStore.h

@@public:

    void commitTileOperations(WebCore::TextureMapper*);

    PassRefPtr<WebCore::BitmapTexture> texture() const;

    void setSize(const WebCore::FloatSize&);

68 virtual void paintToTextureMapper(WebCore::TextureMapper*, const WebCore::FloatRect&, const WebCore::T~~ransformationMatrix&, float, WebCore::BitmapT~~exture*);

68 virtual void paintToTextureMapper(WebCore::TextureMapper*, const WebCore::FloatRect&, const WebCore::TextureMapperPaintParameters&);

private:

    CoordinatedBackingStore()

        : m_scale(1.)

    { }

74 void paintTilesToTextureMapper(Vector<WebCore::TextureMapperTile*>&, WebCore::TextureMapper*, const WebCore::T~~ransformationMatrix&, float, WebCore::BitmapT~~exture*, const WebCore::FloatRect&);

74 void paintTilesToTextureMapper(Vector<WebCore::TextureMapperTile*>&, WebCore::TextureMapper*, const WebCore::TextureMapperPaintParameters&, const WebCore::FloatRect&);

    HashMap<uint32_t, CoordinatedBackingStoreTile> m_tiles;

    HashSet<uint32_t> m_tilesToRemove;