[Texmap] morphing-cubes animation appears too close when clicking the button
authornoam.rosenthal@nokia.com <noam.rosenthal@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Feb 2012 11:57:00 +0000 (11:57 +0000)
committernoam.rosenthal@nokia.com <noam.rosenthal@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Feb 2012 11:57:00 +0000 (11:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78476

Fixed bug in TextureMapperAnimation that made transform animations that go to/from identity
to not work.

Reviewed by Simon Hausmann.

No behavior changes.

* platform/graphics/texmap/TextureMapperAnimation.cpp:
(WebCore::applyTransformAnimation):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp

index 6fdc9cb..62f6316 100644 (file)
@@ -1,3 +1,18 @@
+2012-02-13  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Texmap] morphing-cubes animation appears too close when clicking the button
+        https://bugs.webkit.org/show_bug.cgi?id=78476
+
+        Fixed bug in TextureMapperAnimation that made transform animations that go to/from identity
+        to not work.
+
+        Reviewed by Simon Hausmann.
+
+        No behavior changes.
+
+        * platform/graphics/texmap/TextureMapperAnimation.cpp:
+        (WebCore::applyTransformAnimation):
+
 2012-02-13  Yosifumi Inoue  <yosin@chromium.org>
 
         [Forms] Use enum instead of bool for HTMLInputElement::setValue
index 6be518a..3737492 100644 (file)
@@ -123,7 +123,7 @@ static TransformationMatrix applyTransformAnimation(const TransformOperations* f
 
     // Animation to "-webkit-transform: none".
     if (!to->size()) {
-        TransformOperations blended(*to);
+        TransformOperations blended(*from);
         for (size_t i = 0; i < blended.operations().size(); ++i)
             blended.operations()[i]->blend(0, progress, true)->apply(matrix, boxSize);
         return matrix;
@@ -131,7 +131,7 @@ static TransformationMatrix applyTransformAnimation(const TransformOperations* f
 
     // Animation from "-webkit-transform: none".
     if (!from->size()) {
-        TransformOperations blended(*from);
+        TransformOperations blended(*to);
         for (size_t i = 0; i < blended.operations().size(); ++i)
             blended.operations()[i]->blend(0, 1. - progress, true)->apply(matrix, boxSize);
         return matrix;