Changeset 88247 in webkit

Timestamp:

Jun 7, 2011 9:58:22 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-07 Young Han Lee <​joybro@company100.net>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Accelerated animation is not paused properly.
​https://bugs.webkit.org/show_bug.cgi?id=61446

The transform matrix of an accelerated animation shouldn't be synced with the matrix of the GraphicsLayer when the animation is paused.

• animations/play-state-paused-expected.png: Added.
• animations/play-state-paused-expected.txt: Added.
• animations/play-state-paused.html: Added.

2011-06-07 Young Han Lee <​joybro@company100.net>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Accelerated animation is not paused properly.
​https://bugs.webkit.org/show_bug.cgi?id=61446

The transform matrix of an accelerated animation shouldn't be synced with the matrix of the GraphicsLayer when the animation is paused.

Test: animations/play-state-paused.html

• platform/graphics/texmap/TextureMapperNode.cpp: (WebCore::TextureMapperNode::syncCompositingStateSelf): (WebCore::TextureMapperNode::hasOpacityAnimation): (WebCore::TextureMapperNode::hasTransformAnimation):
• platform/graphics/texmap/TextureMapperNode.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/play-state-paused-expected.png (added)
• LayoutTests/animations/play-state-paused-expected.txt (added)
• LayoutTests/animations/play-state-paused.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/texmap/TextureMapperNode.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-07  Young Han Lee  <joybro@company100.net>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap][Qt] Accelerated animation is not paused properly.
+        https://bugs.webkit.org/show_bug.cgi?id=61446
+
+        The transform matrix of an accelerated animation shouldn't be synced with the matrix of the GraphicsLayer when the animation is paused.
+
+        * animations/play-state-paused-expected.png: Added.
+        * animations/play-state-paused-expected.txt: Added.
+        * animations/play-state-paused.html: Added.
+
 2011-06-07  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-07  Young Han Lee  <joybro@company100.net>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap][Qt] Accelerated animation is not paused properly.
+        https://bugs.webkit.org/show_bug.cgi?id=61446
+
+        The transform matrix of an accelerated animation shouldn't be synced with the matrix of the GraphicsLayer when the animation is paused.
+
+        Test: animations/play-state-paused.html
+
+        * platform/graphics/texmap/TextureMapperNode.cpp:
+        (WebCore::TextureMapperNode::syncCompositingStateSelf):
+        (WebCore::TextureMapperNode::hasOpacityAnimation):
+        (WebCore::TextureMapperNode::hasTransformAnimation):
+        * platform/graphics/texmap/TextureMapperNode.h:
+
 2011-06-07  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

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

@@ -654 +654 @@
         m_currentContent.needsDisplayRect.unite(pendingContent.needsDisplayRect);
 
-    if (!hasRunningOpacityAnimation())
+    if (!hasOpacityAnimation())
         m_opacity = m_state.opacity;
-    if (!hasRunningTransformAnimation())
+    if (!hasTransformAnimation())
         m_transforms.base = m_state.transform;
 }
@@ -816 +816 @@
 }
 
-bool TextureMapperNode::hasRunningOpacityAnimation() const
+bool TextureMapperNode::hasOpacityAnimation() const
 {
     for (size_t i = 0; i < m_animations.size(); ++i) {
         const TextureMapperAnimation& animation = *m_animations[i].get();
-        if (!animation.paused && animation.keyframes.property() == AnimatedPropertyOpacity)
+        if (animation.keyframes.property() == AnimatedPropertyOpacity)
             return true;
     }
@@ -826 +826 @@
 }
 
-bool TextureMapperNode::hasRunningTransformAnimation() const
+bool TextureMapperNode::hasTransformAnimation() const
 {
     for (size_t i = 0; i < m_animations.size(); ++i) {
         const TextureMapperAnimation& animation = *m_animations[i].get();
-        if (!animation.paused && animation.keyframes.property() == AnimatedPropertyWebkitTransform)
+        if (animation.keyframes.property() == AnimatedPropertyWebkitTransform)
             return true;
     }

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h

@@ -178 +178 @@
     void applyOpacityAnimation(float fromOpacity, float toOpacity, double);
     void applyTransformAnimation(const TextureMapperAnimation&, const TransformOperations* start, const TransformOperations* end, double);
-    bool hasRunningOpacityAnimation() const;
-    bool hasRunningTransformAnimation() const;
+    bool hasOpacityAnimation() const;
+    bool hasTransformAnimation() const;
 
     struct TransformData {