ChangeLog

2011-04-20  Nat Duca  <nduca@chromium.org>

        Reviewed by NOBODY (OOPS!).

        [chromium] Fix artefacts in compositor HUD when resizing

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

        HUD was using the tiler program and not setting the texture

        transform. The HUD would thus draw with a texture transform based

        on the last tile drawn, leading sometimes to distortion.

        * platform/graphics/chromium/LayerRendererChromium.cpp:

        (WebCore::LayerRendererChromium::initializeSharedObjects):

        (WebCore::LayerRendererChromium::cleanupSharedObjects):

        * platform/graphics/chromium/LayerRendererChromium.h:

        (WebCore::LayerRendererChromium::headsUpDisplayProgram):

        * platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:

        (WebCore::CCHeadsUpDisplay::draw):

        * platform/graphics/chromium/cc/CCHeadsUpDisplay.h:

2011-04-19  Brent Fulgham  <bfulgham@webkit.org>

        Reviewed by Adam Roben.

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

@@bool LayerRendererChromium::initializeSharedObjects()

    m_sharedGeometry = adoptPtr(new GeometryBinding(m_context.get()));

    m_borderProgram = adoptPtr(new LayerChromium::BorderProgram(m_context.get()));

988 m_headsUpDisplayProgram = adoptPtr(new CCHeadsUpDisplay::Program(m_context.get()));

    m_canvasLayerProgram = adoptPtr(new CCCanvasLayerImpl::Program(m_context.get()));

    m_videoLayerRGBAProgram = adoptPtr(new CCVideoLayerImpl::RGBAProgram(m_context.get()));

    m_videoLayerYUVProgram = adoptPtr(new CCVideoLayerImpl::YUVProgram(m_context.get()));

@@bool LayerRendererChromium::initializeSharedObjects()

    if (!m_sharedGeometry->initialized() || !m_borderProgram->initialized()

        || !m_canvasLayerProgram->initialized()

999 || !m_headsUpDisplayProgram->initialized()

        || !m_videoLayerRGBAProgram->initialized() || !m_videoLayerYUVProgram->initialized()

        || !m_pluginLayerProgram->initialized() || !m_renderSurfaceProgram->initialized()

        || !m_renderSurfaceMaskProgram->initialized() || !m_tilerProgram->initialized()) {

@@void LayerRendererChromium::cleanupSharedObjects()

    m_sharedGeometry.clear();

    m_borderProgram.clear();

    m_canvasLayerProgram.clear();

1019 m_headsUpDisplayProgram.clear();

    m_videoLayerRGBAProgram.clear();

    m_videoLayerYUVProgram.clear();

    m_pluginLayerProgram.clear();

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

@@public:

    const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }

    const LayerChromium::BorderProgram* borderProgram() const { return m_borderProgram.get(); }

113 const CCHeadsUpDisplay::Program* headsUpDisplayProgram() const { return m_headsUpDisplayProgram.get(); }

    const RenderSurfaceChromium::Program* renderSurfaceProgram() const { return m_renderSurfaceProgram.get(); }

    const RenderSurfaceChromium::MaskProgram* renderSurfaceMaskProgram() const { return m_renderSurfaceMaskProgram.get(); }

    const LayerTilerChromium::Program* tilerProgram() const { return m_tilerProgram.get(); }

@@private:

    // we cannot store these values in static variables.

    OwnPtr<GeometryBinding> m_sharedGeometry;

    OwnPtr<LayerChromium::BorderProgram> m_borderProgram;

209 OwnPtr<CCHeadsUpDisplay::Program> m_headsUpDisplayProgram;

    OwnPtr<RenderSurfaceChromium::Program> m_renderSurfaceProgram;

    OwnPtr<RenderSurfaceChromium::MaskProgram> m_renderSurfaceMaskProgram;

    OwnPtr<LayerTilerChromium::Program> m_tilerProgram;

Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp

#include "FontDescription.h"

#include "GraphicsContext3D.h"

#include "LayerChromium.h"

35#include "LayerRendererChromium.h"

#include "LayerTexture.h"

#include "TextRun.h"

#include "TextStream.h"

@@void CCHeadsUpDisplay::draw()

    }

    // Draw the HUD onto the default render surface.

112 const ~~LayerTilerChromium::~~Program* program = m_layerRenderer->ti~~ler~~Program();

113 const Program* program = m_layerRenderer->headsUpDisplayProgram();

    ASSERT(program && program->initialized());

    GLC(context, context->activeTexture(GraphicsContext3D::TEXTURE0));

    m_hudTexture->bindTexture();

Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h

#if USE(ACCELERATED_COMPOSITING)

#include "Font.h"

31 #include "L~~ayerRendererChromium~~.h"

32

31#include "ProgramBinding.h"

32#include "ShaderChromium.h"

namespace WebCore {

class GeometryBinding;

class GraphicsContext3D;

38class LayerRendererChromium;

39class LayerTexture;

// Class that handles drawing of composited render layers using GL.

class CCHeadsUpDisplay {

@@public:

    bool enabled() const { return m_showPlatformLayerTree || m_showFPSCounter; }

    void draw();

63 typedef ProgramBinding<VertexShaderPosTex, FragmentShaderBGRATexAlpha> Program;

64

private:

    explicit CCHeadsUpDisplay(LayerRendererChromium* owner);

    void drawHudContents(GraphicsContext*, const IntSize& hudSize);