Changeset 148200 in webkit

Timestamp:

Apr 11, 2013 7:28:00 AM (11 years ago)

Author:

anilsson@rim.com

Message:

[BlackBerry] Accelerated compositing debug rectangle incorrectly drawn for layers with surfaces
​https://bugs.webkit.org/show_bug.cgi?id=114275

Reviewed by Carlos Garcia Campos.

The drawDebugBorder method was updated to mirror the logic in
compositeLayersRecursive, i.e. if we're compositing a surface to the
screen, use the transformed bounds stored in the surface. The bounds
stored in the layer should only be used when drawing the layer to the
surface.

Speaking of which, also update the code to skip border drawing when
drawing a layer to a surface. Drawing the borders inside the surface
would only result in messing up the surface contents, especially when
CSS filters like blur were the reason for having a surface in the first
place - the border would be blurred and hard to discern.

Only manually testable, the debug border is disabled during layout
tests.

PR 323746

• platform/graphics/blackberry/LayerRenderer.cpp:

(WebCore::LayerRenderer::drawDebugBorder):

• platform/graphics/blackberry/LayerRendererSurface.cpp:

(WebCore::LayerRendererSurface::drawRect):
(WebCore::LayerRendererSurface::transformedBounds): Added.
(WebCore):

• platform/graphics/blackberry/LayerRendererSurface.h:

(LayerRendererSurface):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/blackberry/LayerRenderer.cpp (modified) (1 diff)
• platform/graphics/blackberry/LayerRendererSurface.cpp (modified) (2 diffs)
• platform/graphics/blackberry/LayerRendererSurface.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] Accelerated compositing debug rectangle incorrectly drawn for layers with surfaces
+        https://bugs.webkit.org/show_bug.cgi?id=114275
+
+        Reviewed by Carlos Garcia Campos.
+
+        The drawDebugBorder method was updated to mirror the logic in
+        compositeLayersRecursive, i.e. if we're compositing a surface to the
+        screen, use the transformed bounds stored in the surface. The bounds
+        stored in the layer should only be used when drawing the layer to the
+        surface.
+
+        Speaking of which, also update the code to skip border drawing when
+        drawing a layer to a surface. Drawing the borders inside the surface
+        would only result in messing up the surface contents, especially when
+        CSS filters like blur were the reason for having a surface in the first
+        place - the border would be blurred and hard to discern.
+
+        Only manually testable, the debug border is disabled during layout
+        tests.
+
+        PR 323746
+
+        * platform/graphics/blackberry/LayerRenderer.cpp:
+        (WebCore::LayerRenderer::drawDebugBorder):
+        * platform/graphics/blackberry/LayerRendererSurface.cpp:
+        (WebCore::LayerRendererSurface::drawRect):
+        (WebCore::LayerRendererSurface::transformedBounds): Added.
+        (WebCore):
+        * platform/graphics/blackberry/LayerRendererSurface.h:
+        (LayerRendererSurface):
+
 2013-04-11  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp

@@ -596 +596 @@
         glDisable(GL_BLEND);
 
+    // If we're rendering to a surface, don't include debug border inside the surface.
+    if (m_currentLayerRendererSurface)
+        return;
+
+    FloatQuad transformedBounds;
+    if (layerAlreadyOnSurface(layer))
+        transformedBounds = layer->layerRendererSurface()->transformedBounds();
+    else
+        transformedBounds = layer->getTransformedBounds();
+
     const GLES2Program& program = useProgram(ColorProgram);
-    glVertexAttribPointer(program.positionLocation(), 2, GL_FLOAT, GL_FALSE, 0, &layer->getTransformedBounds());
+    glVertexAttribPointer(program.positionLocation(), 2, GL_FLOAT, GL_FALSE, 0, &transformedBounds);
     glUniform4f(m_colorColorLocation, borderColor.red() / 255.0, borderColor.green() / 255.0, borderColor.blue() / 255.0, 1);
 

trunk/Source/WebCore/platform/graphics/blackberry/LayerRendererSurface.cpp

@@ -51 +51 @@
     float by = m_size.height() / 2.0;
 
-    FloatQuad transformedBounds;
-    transformedBounds.setP1(m_drawTransform.mapPoint(FloatPoint(-bx, -by)));
-    transformedBounds.setP2(m_drawTransform.mapPoint(FloatPoint(-bx, by)));
-    transformedBounds.setP3(m_drawTransform.mapPoint(FloatPoint(bx, by)));
-    transformedBounds.setP4(m_drawTransform.mapPoint(FloatPoint(bx, -by)));
-
-    FloatRect rect = transformedBounds.boundingBox();
+    FloatRect rect = transformedBounds().boundingBox();
 
     if (m_ownerLayer->replicaLayer()) {
@@ -69 +63 @@
 
     return rect;
+}
+
+FloatQuad LayerRendererSurface::transformedBounds() const
+{
+    float bx = m_size.width() / 2.0;
+    float by = m_size.height() / 2.0;
+
+    FloatQuad bounds;
+    bounds.setP1(m_drawTransform.mapPoint(FloatPoint(-bx, -by)));
+    bounds.setP2(m_drawTransform.mapPoint(FloatPoint(-bx, by)));
+    bounds.setP3(m_drawTransform.mapPoint(FloatPoint(bx, by)));
+    bounds.setP4(m_drawTransform.mapPoint(FloatPoint(bx, -by)));
+
+    return bounds;
 }
 

trunk/Source/WebCore/platform/graphics/blackberry/LayerRendererSurface.h

@@ -52 +52 @@
 
     FloatRect drawRect() const;
+    FloatQuad transformedBounds() const;
 
     bool ensureTexture();