Title: [149288] trunk
Revision
149288
Author
k...@webkit.org
Date
2013-04-29 08:46:26 -0700 (Mon, 29 Apr 2013)

Log Message

Animate clip rect() between different Length types
https://bugs.webkit.org/show_bug.cgi?id=115336

Reviewed by Andreas Kling.

Source/WebCore:

At the moment the animation for the 'clip' property
has an early return if the type of two Length values
does not match. This patch removes this early return.

Modified existing tests to cover the changes.

* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc):

LayoutTests:

Modify test for clip animation to cover animations between
different Length types.

* transitions/clip-transition.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (149287 => 149288)


--- trunk/LayoutTests/ChangeLog	2013-04-29 15:33:31 UTC (rev 149287)
+++ trunk/LayoutTests/ChangeLog	2013-04-29 15:46:26 UTC (rev 149288)
@@ -1,3 +1,15 @@
+2013-04-29  Dirk Schulze  <k...@webkit.org>
+
+        Animate clip rect() between different Length types
+        https://bugs.webkit.org/show_bug.cgi?id=115336
+
+        Reviewed by Andreas Kling.
+
+        Modify test for clip animation to cover animations between
+        different Length types.
+
+        * transitions/clip-transition.html:
+
 2013-04-29  Zoltan Arvai  <zar...@inf.u-szeged.hu>
 
         [Qt] Unreviewed gardening.

Modified: trunk/LayoutTests/transitions/clip-transition.html (149287 => 149288)


--- trunk/LayoutTests/transitions/clip-transition.html	2013-04-29 15:33:31 UTC (rev 149287)
+++ trunk/LayoutTests/transitions/clip-transition.html	2013-04-29 15:46:26 UTC (rev 149288)
@@ -8,12 +8,12 @@
       height: 100px;
       width: 100px;
       background-color: blue;
-      clip: rect(10px, 90px, 90px, 10px);
+      clip: rect(10px, 2.38cm, 90px, 10px);
       -webkit-transition: clip 1s linear;
     }
 
     #box.changed {
-      clip: rect(30px, 70px, 70px, 30px);
+      clip: rect(0.795cm, 70px, 1.85cm, 30px);
     }
   </style>
   <script src=""

Modified: trunk/Source/WebCore/ChangeLog (149287 => 149288)


--- trunk/Source/WebCore/ChangeLog	2013-04-29 15:33:31 UTC (rev 149287)
+++ trunk/Source/WebCore/ChangeLog	2013-04-29 15:46:26 UTC (rev 149288)
@@ -1,3 +1,19 @@
+2013-04-29  Dirk Schulze  <k...@webkit.org>
+
+        Animate clip rect() between different Length types
+        https://bugs.webkit.org/show_bug.cgi?id=115336
+
+        Reviewed by Andreas Kling.
+
+        At the moment the animation for the 'clip' property
+        has an early return if the type of two Length values
+        does not match. This patch removes this early return.
+
+        Modified existing tests to cover the changes.
+
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::blendFunc):
+
 2013-04-29  Andreas Kling  <akl...@apple.com>
 
         When updating geometry, send _javascript_ resize before before layout/paint.

Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (149287 => 149288)


--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp	2013-04-29 15:33:31 UTC (rev 149287)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp	2013-04-29 15:46:26 UTC (rev 149288)
@@ -218,13 +218,6 @@
 
 static inline LengthBox blendFunc(const AnimationBase* anim, const LengthBox& from, const LengthBox& to, double progress)
 {
-    // Length types have to match to animate
-    if (from.top().type() != to.top().type()
-        || from.right().type() != to.right().type()
-        || from.bottom().type() != to.bottom().type()
-        || from.left().type() != to.left().type())
-        return to;
-
     LengthBox result(blendFunc(anim, from.top(), to.top(), progress),
                      blendFunc(anim, from.right(), to.right(), progress),
                      blendFunc(anim, from.bottom(), to.bottom(), progress),
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to