Changeset 148115 in webkit

Timestamp:

Apr 10, 2013 11:26:26 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Texmap] In certain situations nested blending with overflow:hidden displays clipped results
​https://bugs.webkit.org/show_bug.cgi?id=114290

Patch by Noam Rosenthal <Noam Rosenthal> on 2013-04-10
Reviewed by Allan Sandfeld Jensen.

Source/WebCore:

Always apply the clip when binding a surface, even if it hasn't changed.
Otherwise when binding a nested surface and rebinding its container surface,
the clip wouldn't apply.

Test: compositing/overlap-blending/nested-overlap-overflow.html

• platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::BitmapTextureGL::bind):

LayoutTests:

Added a ref-test that exposes an issue with TextureMapper overlap blending when composited.
This ref-test does not show correct results on Mac, skipped in TestExpectations and created a bug.

• compositing/overlap-blending/nested-overlap-overflow-expected.html: Added.
• compositing/overlap-blending/nested-overlap-overflow.html: Added.
• platform/mac/TestExpectations: Skipped new tests and created bug.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/overlap-blending/nested-overlap-overflow-expected.html (added)
• LayoutTests/compositing/overlap-blending/nested-overlap-overflow.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-10  Noam Rosenthal  <noam@webkit.org>
+
+        [Texmap] In certain situations nested blending with overflow:hidden displays clipped results
+        https://bugs.webkit.org/show_bug.cgi?id=114290
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        Added a ref-test that exposes an issue with TextureMapper overlap blending when composited.
+        This ref-test does not show correct results on Mac, skipped in TestExpectations and created a bug.
+
+        * compositing/overlap-blending/nested-overlap-overflow-expected.html: Added.
+        * compositing/overlap-blending/nested-overlap-overflow.html: Added.
+        * platform/mac/TestExpectations: Skipped new tests and created bug.
+
 2013-04-10  Victor Costan  <costan@gmail.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -941 +941 @@
 compositing/overlap-blending/nested-overlap.html
 compositing/overlap-blending/nested-non-overlap-clipping.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=114338
+compositing/overlap-blending/nested-overlap-overflow.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=95027

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-10  Noam Rosenthal  <noam@webkit.org>
+
+        [Texmap] In certain situations nested blending with overflow:hidden displays clipped results
+        https://bugs.webkit.org/show_bug.cgi?id=114290
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        Always apply the clip when binding a surface, even if it hasn't changed.
+        Otherwise when binding a nested surface and rebinding its container surface,
+        the clip wouldn't apply.
+
+        Test: compositing/overlap-blending/nested-overlap-overflow.html
+
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        (WebCore::BitmapTextureGL::bind):
+
 2013-04-10  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

@@ -1063 +1063 @@
     clearIfNeeded();
     textureMapper->data().projectionMatrix = createProjectionMatrix(m_textureSize, true /* mirrored */);
-    m_clipStack.applyIfNeeded(m_context3D.get());
+    m_clipStack.apply(m_context3D.get());
 }