Changeset 139070 in webkit

Timestamp:

Jan 8, 2013 10:08:02 AM (11 years ago)

Author:

alexis@webkit.org

Message:

transition-delay and transition-duration return incorrect values when querying using the computed style.
​https://bugs.webkit.org/show_bug.cgi?id=105432

Reviewed by Dean Jackson.

Source/WebCore:

When setting the transition-delay to 10ms for example the value of transition-delay
on the computed style was incorrect, it should return 0.01s but it was
returning something like 0.0099999999...s. In fact the bug was after
the parsing step when creating the Animation object where a conversion
from a double to float was done. This conversion is not needed as the
animation class expects double for delay and transition times.

Test: transitions/transitions-parsing.html

• css/CSSToStyleMap.cpp:

(WebCore::CSSToStyleMap::mapAnimationDelay):
(WebCore::CSSToStyleMap::mapAnimationDuration):

LayoutTests:

Uncomment existing tests to cover the bug.

• transitions/transitions-parsing-expected.txt:
• transitions/transitions-parsing.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/transitions/transitions-parsing-expected.txt (modified) (2 diffs)
• LayoutTests/transitions/transitions-parsing.html (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSToStyleMap.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-08  Alexis Menard  <alexis@webkit.org>
+
+        transition-delay and transition-duration return incorrect values when querying using the computed style.
+        https://bugs.webkit.org/show_bug.cgi?id=105432
+
+        Reviewed by Dean Jackson.
+
+        Uncomment existing tests to cover the bug.
+
+        * transitions/transitions-parsing-expected.txt:
+        * transitions/transitions-parsing.html:
+
 2013-01-08  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/LayoutTests/transitions/transitions-parsing-expected.txt

@@ -71 +71 @@
 PASS style.webkitTransitionDuration is '5s'
 PASS computedStyle.webkitTransitionDuration is '5s'
+PASS style.transitionDuration is '10ms'
+PASS computedStyle.transitionDuration is '0.01s'
+PASS style.webkitTransitionDuration is '10ms'
+PASS computedStyle.webkitTransitionDuration is '0.01s'
+PASS style.transitionDuration is '10ms, 20s'
+PASS computedStyle.transitionDuration is '0.01s, 20s'
+PASS style.webkitTransitionDuration is '10ms, 20s'
+PASS computedStyle.webkitTransitionDuration is '0.01s, 20s'
 Invalid transition-duration values.
+PASS style.transitionDuration is ''
+PASS computedStyle.transitionDuration is '0s'
+PASS style.webkitTransitionDuration is ''
+PASS computedStyle.webkitTransitionDuration is '0s'
 PASS style.transitionDuration is ''
 PASS computedStyle.transitionDuration is '0s'
@@ -251 +263 @@
 PASS style.webkitTransitionDelay is '5s'
 PASS computedStyle.webkitTransitionDelay is '5s'
+PASS style.transitionDelay is '10ms'
+PASS computedStyle.transitionDelay is '0.01s'
+PASS style.webkitTransitionDelay is '10ms'
+PASS computedStyle.webkitTransitionDelay is '0.01s'
+PASS style.transitionDelay is '-10ms'
+PASS computedStyle.transitionDelay is '-0.01s'
+PASS style.webkitTransitionDelay is '-10ms'
+PASS computedStyle.webkitTransitionDelay is '-0.01s'
+PASS style.transitionDelay is '-10ms, 20s'
+PASS computedStyle.transitionDelay is '-0.01s, 20s'
+PASS style.webkitTransitionDelay is '-10ms, 20s'
+PASS computedStyle.webkitTransitionDelay is '-0.01s, 20s'
 Invalid transition-duration values.
 PASS style.transitionDelay is ''

trunk/LayoutTests/transitions/transitions-parsing.html

@@ -136 +136 @@
 shouldBe("computedStyle.webkitTransitionDuration", "'5s'");
 
-// Tracked by https://bugs.webkit.org/show_bug.cgi?id=105432.
-/*style.transitionDuration = "10ms";
+style.transitionDuration = "10ms";
 shouldBe("style.transitionDuration", "'10ms'");
 shouldBe("computedStyle.transitionDuration", "'0.01s'");
@@ -143 +142 @@
 shouldBe("computedStyle.webkitTransitionDuration", "'0.01s'");
 
-// Negative values should be treated as 0s.
-style.transitionDuration = "-10ms";
-shouldBe("style.transitionDuration", "'0s'");
-shouldBe("computedStyle.transitionDuration", "'0s'");
-shouldBe("style.webkitTransitionDuration", "'0s'");
-shouldBe("computedStyle.webkitTransitionDuration", "'0s'");
-
 style.transitionProperty = "opacity, width";
 
-style.transitionDuration = "-10ms, 20s";
-shouldBe("style.transitionDuration", "'0s, 20s'");
-shouldBe("computedStyle.transitionDuration", "'0s, 20s'");
-shouldBe("style.webkitTransitionDuration", "'0s, 20s'");
-shouldBe("computedStyle.webkitTransitionDuration", "'0s, 20s'");*/
+style.transitionDuration = "10ms, 20s";
+shouldBe("style.transitionDuration", "'10ms, 20s'");
+shouldBe("computedStyle.transitionDuration", "'0.01s, 20s'");
+shouldBe("style.webkitTransitionDuration", "'10ms, 20s'");
+shouldBe("computedStyle.webkitTransitionDuration", "'0.01s, 20s'");
 
 debug("Invalid transition-duration values.");
 style.transitionProperty = "opacity";
 style.transitionDuration = "";
+
+// Negative values are invalid.
+style.transitionDuration = "-10ms";
+shouldBe("style.transitionDuration", "''");
+shouldBe("computedStyle.transitionDuration", "'0s'");
+shouldBe("style.webkitTransitionDuration", "''");
+shouldBe("computedStyle.webkitTransitionDuration", "'0s'");
 
 style.transitionDuration = "'5ms'";
@@ -436 +435 @@
 shouldBe("computedStyle.webkitTransitionDelay", "'5s'");
 
-// Tracked by https://bugs.webkit.org/show_bug.cgi?id=105432.
-/*style.transitionDelay = "10ms";
+style.transitionDelay = "10ms";
 shouldBe("style.transitionDelay", "'10ms'");
-shouldBe("computedStyle.transitionDelay", "'10ms'");
+shouldBe("computedStyle.transitionDelay", "'0.01s'");
 shouldBe("style.webkitTransitionDelay", "'10ms'");
-shouldBe("computedStyle.webkitTransitionDelay", "'10ms'");
+shouldBe("computedStyle.webkitTransitionDelay", "'0.01s'");
 
 style.transitionDelay = "-10ms";
@@ -455 +453 @@
 shouldBe("computedStyle.transitionDelay", "'-0.01s, 20s'");
 shouldBe("style.webkitTransitionDelay", "'-10ms, 20s'");
-shouldBe("computedStyle.webkitTransitionDelay", "'-0.01s, 20s'");*/
+shouldBe("computedStyle.webkitTransitionDelay", "'-0.01s, 20s'");
 
 debug("Invalid transition-duration values.");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-08  Alexis Menard  <alexis@webkit.org>
+
+        transition-delay and transition-duration return incorrect values when querying using the computed style.
+        https://bugs.webkit.org/show_bug.cgi?id=105432
+
+        Reviewed by Dean Jackson.
+
+        When setting the transition-delay to 10ms for example the value of transition-delay
+        on the computed style was incorrect, it should return 0.01s but it was
+        returning something like 0.0099999999...s. In fact the bug was after
+        the parsing step when creating the Animation object where a conversion
+        from a double to float was done. This conversion is not needed as the
+        animation class expects double for delay and transition times.
+
+        Test: transitions/transitions-parsing.html
+
+        * css/CSSToStyleMap.cpp:
+        (WebCore::CSSToStyleMap::mapAnimationDelay):
+        (WebCore::CSSToStyleMap::mapAnimationDuration):
+
 2013-01-08  Hajime Morrita  <morrita@google.com>
 

trunk/Source/WebCore/css/CSSToStyleMap.cpp

@@ -297 +297 @@
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
-    animation->setDelay(primitiveValue->computeTime<float, CSSPrimitiveValue::Seconds>());
+    animation->setDelay(primitiveValue->computeTime<double, CSSPrimitiveValue::Seconds>());
 }
 
@@ -338 +338 @@
 
     CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
-    animation->setDuration(primitiveValue->computeTime<float, CSSPrimitiveValue::Seconds>());
+    animation->setDuration(primitiveValue->computeTime<double, CSSPrimitiveValue::Seconds>());
 }