Changeset 123837 in webkit

Timestamp:

Jul 26, 2012, 9:32:08 PM (13 years ago)

Author:

mikelawther@chromium.org

Message:

Make transitions work between different Length types
​https://bugs.webkit.org/show_bug.cgi?id=92220

Reviewed by Simon Fraser.

Source/WebCore:

Use the existing CSS calc machinery for blending between two calculations
to blend between two Lengths of differing types.

Test: transitions/mixed-type.html

• platform/Length.cpp:

(WebCore::Length::blendMixedTypes):

• platform/Length.h:

(WebCore::Length::blend):
(Length):

LayoutTests:

• transitions/mixed-type-expected.txt: Added.
• transitions/mixed-type.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/transitions/mixed-type-expected.txt (added)
• LayoutTests/transitions/mixed-type.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/Length.cpp (modified) (1 diff)
• Source/WebCore/platform/Length.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-26  Mike Lawther  <mikelawther@chromium.org>
+
+        Make transitions work between different Length types
+        https://bugs.webkit.org/show_bug.cgi?id=92220
+
+        Reviewed by Simon Fraser.
+
+        * transitions/mixed-type-expected.txt: Added.
+        * transitions/mixed-type.html: Added.
+
 2012-07-26  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-26  Mike Lawther  <mikelawther@chromium.org>
+
+        Make transitions work between different Length types
+        https://bugs.webkit.org/show_bug.cgi?id=92220
+
+        Reviewed by Simon Fraser.
+
+        Use the existing CSS calc machinery for blending between two calculations
+        to blend between two Lengths of differing types.
+
+        Test: transitions/mixed-type.html
+
+        * platform/Length.cpp:
+        (WebCore::Length::blendMixedTypes):
+        * platform/Length.h:
+        (WebCore::Length::blend):
+        (Length):
+
 2012-07-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/Length.cpp

@@ -203 +203 @@
 }
         
-Length Length::blendCalculation(const Length& from, double progress) const
+Length Length::blendMixedTypes(const Length& from, double progress) const
 {
     if (progress <= 0.0)

trunk/Source/WebCore/platform/Length.h

@@ -232 +232 @@
         // Blend two lengths to produce a new length that is in between them.  Used for animation.
         if (from.type() == Calculated || type() == Calculated)
-            return blendCalculation(from, progress);
+            return blendMixedTypes(from, progress);
         
         if (!from.isZero() && !isZero() && from.type() != type())
-            return *this;
+            return blendMixedTypes(from, progress);
 
         if (from.isZero() && isZero())
@@ -293 +293 @@
     }
 
-    Length blendCalculation(const Length& from, double progress) const;
+    Length blendMixedTypes(const Length& from, double progress) const;
 
     int calculationHandle() const