Changeset 84546 in webkit

Timestamp:

Apr 21, 2011 2:22:27 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by James Robinson.

[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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (3 diffs)
• platform/graphics/chromium/LayerRendererChromium.h (modified) (2 diffs)
• platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp (modified) (2 diffs)
• platform/graphics/chromium/cc/CCHeadsUpDisplay.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-21  Nat Duca  <nduca@chromium.org>
+
+        Reviewed by James Robinson.
+
+        [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-21  Mike Reed  <reed@google.com>
 

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

@@ -986 +986 @@
     m_sharedGeometry = adoptPtr(new GeometryBinding(m_context.get()));
     m_borderProgram = adoptPtr(new LayerChromium::BorderProgram(m_context.get()));
+    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()));
@@ -996 +997 @@
     if (!m_sharedGeometry->initialized() || !m_borderProgram->initialized()
         || !m_canvasLayerProgram->initialized()
+        || !m_headsUpDisplayProgram->initialized()
         || !m_videoLayerRGBAProgram->initialized() || !m_videoLayerYUVProgram->initialized()
         || !m_pluginLayerProgram->initialized() || !m_renderSurfaceProgram->initialized()
@@ -1015 +1017 @@
     m_borderProgram.clear();
     m_canvasLayerProgram.clear();
+    m_headsUpDisplayProgram.clear();
     m_videoLayerRGBAProgram.clear();
     m_videoLayerYUVProgram.clear();

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

@@ -111 +111 @@
     const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
     const LayerChromium::BorderProgram* borderProgram() const { return m_borderProgram.get(); }
+    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(); }
@@ -206 +207 @@
     OwnPtr<GeometryBinding> m_sharedGeometry;
     OwnPtr<LayerChromium::BorderProgram> m_borderProgram;
+    OwnPtr<CCHeadsUpDisplay::Program> m_headsUpDisplayProgram;
     OwnPtr<RenderSurfaceChromium::Program> m_renderSurfaceProgram;
     OwnPtr<RenderSurfaceChromium::MaskProgram> m_renderSurfaceMaskProgram;

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

@@ -33 +33 @@
 #include "GraphicsContext3D.h"
 #include "LayerChromium.h"
+#include "LayerRendererChromium.h"
 #include "LayerTexture.h"
 #include "TextRun.h"
@@ -110 +111 @@
 
     // Draw the HUD onto the default render surface.
-    const LayerTilerChromium::Program* program = m_layerRenderer->tilerProgram();
+    const Program* program = m_layerRenderer->headsUpDisplayProgram();
     ASSERT(program && program->initialized());
     GLC(context, context->activeTexture(GraphicsContext3D::TEXTURE0));

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

@@ -29 +29 @@
 
 #include "Font.h"
-#include "LayerRendererChromium.h"
-
+#include "ProgramBinding.h"
+#include "ShaderChromium.h"
 
 namespace WebCore {
@@ -36 +36 @@
 class GeometryBinding;
 class GraphicsContext3D;
+class LayerRendererChromium;
+class LayerTexture;
 
 // Class that handles drawing of composited render layers using GL.
@@ -58 +60 @@
     bool enabled() const { return m_showPlatformLayerTree || m_showFPSCounter; }
     void draw();
+
+    typedef ProgramBinding<VertexShaderPosTex, FragmentShaderBGRATexAlpha> Program;
 
 private: