Changeset 98776 in webkit

Timestamp:

Oct 28, 2011, 4:18:08 PM (15 years ago)

Author:

Simon Fraser

Message:

If visibility changes while an accelerated animation is running, element jumps around
​https://bugs.webkit.org/show_bug.cgi?id=29984

Source/WebCore:

Reviewed by Chris Marrin.

Compositing now affects whether RenderLayers for visibility:hidden elements
are included in z-order lists. So we have to dirty those lists when we enter
compopsiting mode.

Test: compositing/visibility/animation-visibility.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateVisibilityStatus): Removed trailing whitespace.
(WebCore::RenderLayer::dirtyZOrderLists): Call dirtyZOrderListsInternal(), which doesn't have
to ping the compositor.
(WebCore::RenderLayer::dirtyZOrderListsInternal):
(WebCore::RenderLayer::dirtyZOrderListsIncludingDescendants): Recursively dirty z-order
lists.

• rendering/RenderLayer.h:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::enableCompositingMode): When going into compositing mode,
dirty all z-order lists.

LayoutTests:

Reviewed by Chris Marrin.

Add testcase for visibility changing in the middle of an accelerated animation.

• animations/resources/animation-test-helpers.js: Add some constants for readability.

(checkExpectedValue): Add support for testing 'visibility'.

• compositing/visibility/animation-visibility-expected.png: Added.
• compositing/visibility/animation-visibility-expected.txt: Added.
• compositing/visibility/animation-visibility.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/resources/animation-test-helpers.js (modified) (2 diffs)
• LayoutTests/compositing/visibility/animation-visibility-expected.png (added)
• LayoutTests/compositing/visibility/animation-visibility-expected.txt (added)
• LayoutTests/compositing/visibility/animation-visibility.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderLayer.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-28  Simon Fraser  <simon.fraser@apple.com>
+
+        If visibility changes while an accelerated animation is running, element jumps around
+        https://bugs.webkit.org/show_bug.cgi?id=29984
+
+        Reviewed by Chris Marrin.
+        
+        Add testcase for visibility changing in the middle of an accelerated animation.
+
+        * animations/resources/animation-test-helpers.js: Add some constants for readability.
+        (checkExpectedValue): Add support for testing 'visibility'.
+        * compositing/visibility/animation-visibility-expected.png: Added.
+        * compositing/visibility/animation-visibility-expected.txt: Added.
+        * compositing/visibility/animation-visibility.html: Added.
+
 2011-10-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/LayoutTests/animations/resources/animation-test-helpers.js

@@ -33 +33 @@
 
 */
+
+const doPixelTest = true;
+const dontDoPixelTest = false;
 
 function isCloseEnough(actual, desired, tolerance)
@@ -141 +144 @@
         else
             pass = isCloseEnough(computedValue, expectedValue, tolerance);
+    } else if (property == "visibility") {
+        var element;
+        if (iframeId)
+            element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
+        else
+            element = document.getElementById(elementId);
+
+        computedValue = window.getComputedStyle(element).visibility;
+        if (compareElements) {
+            computedValue2 = window.getComputedStyle(document.getElementById(elementId2)).visibility;
+            pass = computedValue == computedValue2;
+        }
+        else
+            pass = computedValue == expectedValue;
     } else {
         var element;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Simon Fraser  <simon.fraser@apple.com>
+
+        If visibility changes while an accelerated animation is running, element jumps around
+        https://bugs.webkit.org/show_bug.cgi?id=29984
+
+        Reviewed by Chris Marrin.
+        
+        Compositing now affects whether RenderLayers for visibility:hidden elements
+        are included in z-order lists. So we have to dirty those lists when we enter
+        compopsiting mode.
+
+        Test: compositing/visibility/animation-visibility.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateVisibilityStatus): Removed trailing whitespace.
+        (WebCore::RenderLayer::dirtyZOrderLists): Call dirtyZOrderListsInternal(), which doesn't have
+        to ping the compositor.
+        (WebCore::RenderLayer::dirtyZOrderListsInternal):
+        (WebCore::RenderLayer::dirtyZOrderListsIncludingDescendants): Recursively dirty z-order
+        lists.
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::enableCompositingMode): When going into compositing mode,
+        dirty all z-order lists.
+
 2011-10-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -618 +618 @@
         m_hasVisibleDescendant = false;
         for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
-            child->updateVisibilityStatus();        
+            child->updateVisibilityStatus();
             if (child->m_hasVisibleContent || child->m_hasVisibleDescendant) {
                 m_hasVisibleDescendant = true;
@@ -3971 +3971 @@
 void RenderLayer::dirtyZOrderLists()
 {
+    dirtyZOrderListsInternal();
+    
+#if USE(ACCELERATED_COMPOSITING)
+    if (!renderer()->documentBeingDestroyed())
+        compositor()->setCompositingLayersNeedRebuild();
+#endif
+}
+
+void RenderLayer::dirtyZOrderListsInternal()
+{
     if (m_posZOrderList)
         m_posZOrderList->clear();
@@ -3976 +3986 @@
         m_negZOrderList->clear();
     m_zOrderListsDirty = true;
-
-#if USE(ACCELERATED_COMPOSITING)
-    if (!renderer()->documentBeingDestroyed())
-        compositor()->setCompositingLayersNeedRebuild();
-#endif
+}
+
+void RenderLayer::dirtyZOrderListsIncludingDescendants()
+{
+    dirtyZOrderListsInternal();
+
+    for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
+        child->dirtyZOrderListsIncludingDescendants();
 }
 

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -377 +377 @@
 
     void dirtyZOrderLists();
+    void dirtyZOrderListsIncludingDescendants();
     void dirtyStackingContextZOrderLists();
     void updateZOrderLists();
@@ -541 +542 @@
     void setFirstChild(RenderLayer* first) { m_first = first; }
     void setLastChild(RenderLayer* last) { m_last = last; }
+    
+    void dirtyZOrderListsInternal();
 
     LayoutPoint renderBoxLocation() const { return renderer()->isBox() ? toRenderBox(renderer())->location() : LayoutPoint(); }

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -125 +125 @@
         if (m_compositing) {
             ensureRootLayer();
+            // Compositing affects whether visibility:hidden layers are included in z-order lists, so we have to dirty the lists here.
+            rootRenderLayer()->dirtyZOrderListsIncludingDescendants();
             notifyIFramesOfCompositingChange();
         } else
@@ -1124 +1126 @@
     }
 }
-
 
 void RenderLayerCompositor::repaintCompositedLayersAbsoluteRect(const LayoutRect& absRect)