Changeset 166309 in webkit

Timestamp:

Mar 26, 2014, 12:36:51 PM (11 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r155977): matrix animations no longer animate
​https://bugs.webkit.org/show_bug.cgi?id=130789
<rdar://problem/15650946>

Source/WebCore:

Reviewed by Dean Jackson.

r155977 erroneously removed two lines that set the end points for
matrix animations (used when transform lists don't match), so
put them back.

Also don't repaint when updateContentsScale()
is called and doesn't change the contents scale.

Test: compositing/animation/matrix-animation.html

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::updateRootRelativeScale):
(WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
(WebCore::GraphicsLayerCA::updateContentsScale):

LayoutTests:

Reviewed by Dean Jackson.

Add test for fill-fowards animation with mismatched transform lists.

• compositing/animation/matrix-animation-expected.html: Added.
• compositing/animation/matrix-animation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/animation/matrix-animation-expected.html (added)
• LayoutTests/compositing/animation/matrix-animation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-26  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r155977): matrix animations no longer animate
+        https://bugs.webkit.org/show_bug.cgi?id=130789
+        <rdar://problem/15650946>
+
+        Reviewed by Dean Jackson.
+        
+        Add test for fill-fowards animation with mismatched transform lists.
+
+        * compositing/animation/matrix-animation-expected.html: Added.
+        * compositing/animation/matrix-animation.html: Added.
+
 2014-03-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-26  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r155977): matrix animations no longer animate
+        https://bugs.webkit.org/show_bug.cgi?id=130789
+        <rdar://problem/15650946>
+
+        Reviewed by Dean Jackson.
+        
+        r155977 erroneously removed two lines that set the end points for
+        matrix animations (used when transform lists don't match), so
+        put them back.
+        
+        Also don't repaint when updateContentsScale()
+        is called and doesn't change the contents scale.
+
+        Test: compositing/animation/matrix-animation.html
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateRootRelativeScale):
+        (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
+        (WebCore::GraphicsLayerCA::updateContentsScale):
+
 2014-03-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1166 +1166 @@
         rootRelativeScaleFactor = maxScaleFromTransform(*transformFromRoot);
     }
-    
+
     if (rootRelativeScaleFactor != m_rootRelativeScaleFactor) {
         m_rootRelativeScaleFactor = rootRelativeScaleFactor;
@@ -2704 +2704 @@
         if (!fromTransform.isInvertible() || !toTransform.isInvertible())
             return false;
+
+        basicAnim->setFromValue(fromTransform);
+        basicAnim->setToValue(toTransform);
     } else {
         if (isTransformTypeNumber(transformOpType)) {
@@ -2946 +2949 @@
 {
     float contentsScale = clampedContentsScaleForScale(m_rootRelativeScaleFactor * pageScaleFactor * deviceScaleFactor());
+    if (contentsScale == m_layer->contentsScale())
+        return;
+
     m_layer->setContentsScale(contentsScale);
     if (drawsContent())