[EFL][WK2] compositing/layer-creation/fixed-position-out-of-view-scaled.html is flaky
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Feb 2013 12:11:58 +0000 (12:11 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Feb 2013 12:11:58 +0000 (12:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=110059

Patch by Huang Dongsung <luxtella@company100.net> on 2013-02-18
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Remove the ASSERT check in TextureMapperLayer. This assertion seems
valid because CoordinatedGraphicsScene::adjustPositionForFixedLayers() calls
TextureMapperLayer::setScrollPositionDeltaIfNeeded() when the graphics
layer is a fixed position layer. However, the assertion can be failed
because it is possible that TextureMapperLayer is a non-fixed position
layer when the graphics layer that holds the TextureMapperLayer is a
fixed position layer. When CoordinatedGraphicsScene flushes,
TextureMapperLayer becomes a fixed position layer.

No new tests. No change in behavior.

* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::setScrollPositionDeltaIfNeeded):

LayoutTests:

Unskip two tests on EFL port. Now those pass.
compositing/layer-creation/fixed-position-out-of-view-scaled.html
compositing/layer-creation/fixed-position-out-of-view-scaled-scroll.html

* platform/efl-wk2/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/efl-wk2/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

index f5e8316020c2fb35f54b15b8c1fb676a69b8f040..4346be097685576d70d0717bd754d48ee7888ddf 100644 (file)
@@ -1,3 +1,16 @@
+2013-02-18  Huang Dongsung  <luxtella@company100.net>
+
+        [EFL][WK2] compositing/layer-creation/fixed-position-out-of-view-scaled.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=110059
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Unskip two tests on EFL port. Now those pass.
+        compositing/layer-creation/fixed-position-out-of-view-scaled.html
+        compositing/layer-creation/fixed-position-out-of-view-scaled-scroll.html
+
+        * platform/efl-wk2/TestExpectations:
+
 2013-02-18  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         Unreviewed EFL gardening.
index 9b7ee57ebfabea99f7b9e24068b18cce8db2e13e..a3105bd05c077a3c7ff585679e61c20bdf0ffb99 100644 (file)
@@ -78,10 +78,6 @@ webkit.org/b/109945 webgl/conformance/uniforms/gl-uniform-arrays.html [ Crash Fa
 webkit.org/b/109945 webgl/conformance/uniforms/uniform-default-values.html [ Crash ]
 webkit.org/b/109945 webgl/conformance/ogles/GL/swizzlers/swizzlers_081_to_088.html [ Crash ]
 
-# ASSERTION FAILED: m_fixedToViewport.
-webkit.org/b/110059 [ Debug ] compositing/layer-creation/fixed-position-out-of-view-scaled.html [ Crash Pass ]
-webkit.org/b/110059 [ Debug ] compositing/layer-creation/fixed-position-out-of-view-scaled-scroll.html [ Crash Pass ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # FLAKY TESTS
 #////////////////////////////////////////////////////////////////////////////////////////
index 8d03896a20549201fe523286344ee4e89ff3cadf..bb2da3441e65c6e0ff0bd78134b4bf12d05145d5 100644 (file)
@@ -1,3 +1,24 @@
+2013-02-18  Huang Dongsung  <luxtella@company100.net>
+
+        [EFL][WK2] compositing/layer-creation/fixed-position-out-of-view-scaled.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=110059
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove the ASSERT check in TextureMapperLayer. This assertion seems
+        valid because CoordinatedGraphicsScene::adjustPositionForFixedLayers() calls
+        TextureMapperLayer::setScrollPositionDeltaIfNeeded() when the graphics
+        layer is a fixed position layer. However, the assertion can be failed
+        because it is possible that TextureMapperLayer is a non-fixed position
+        layer when the graphics layer that holds the TextureMapperLayer is a
+        fixed position layer. When CoordinatedGraphicsScene flushes,
+        TextureMapperLayer becomes a fixed position layer.
+
+        No new tests. No change in behavior.
+
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::setScrollPositionDeltaIfNeeded):
+
 2013-02-18  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 
         [WK2][EFL] Unified text checker implementation
index 63ac9ed5513352fcd38a999230fc57faf3eaac73..88eb3cd1fd97f0fcfc11175daf867a5258b918d3 100644 (file)
@@ -603,7 +603,6 @@ void TextureMapperLayer::setScrollPositionDeltaIfNeeded(const FloatSize& delta)
     // in the web process. We add this delta to the position of fixed layers, to make
     // sure that they do not move while scrolling. We need to reset this delta to fixed layers
     // that have an ancestor which is also a fixed layer, because the delta will be added to the ancestor.
-    ASSERT(m_fixedToViewport);
     if (isAncestorFixedToViewport())
         m_scrollPositionDelta = FloatSize();
     else