Changeset 176458 in webkit

Timestamp:

Nov 21, 2014, 11:48:21 AM (12 years ago)

Author:

Chris Dumez

Message:

Crash when setting 'transition-delay' CSS property to a calculated value
​https://bugs.webkit.org/show_bug.cgi?id=138784

Reviewed by Sam Weinig.

Source/WebCore:

Update CSSPrimitiveValue::computeTime() to use primitiveType() instead
of m_primitiveUnitType so that it properly handles calculated values.
Without this, we would hit the ASSERT_NOT_REACHED() assertion in
computeTime() for calculated values.

Test: fast/css/transition-delay-calculated-value.html

• css/CSSPrimitiveValue.h:

(WebCore::CSSPrimitiveValue::computeTime):

LayoutTests:

Add a layout test to check that setting the 'transition-delay' CSS
property to a calculated value does not crash and works as intended.

• fast/css/transition-delay-calculated-value-expected.txt: Added.
• fast/css/transition-delay-calculated-value.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/transition-delay-calculated-value-expected.txt (added)
• LayoutTests/fast/css/transition-delay-calculated-value.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSPrimitiveValue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-21  Chris Dumez  <cdumez@apple.com>
+
+        Crash when setting 'transition-delay' CSS property to a calculated value
+        https://bugs.webkit.org/show_bug.cgi?id=138784
+
+        Reviewed by Sam Weinig.
+
+        Add a layout test to check that setting the 'transition-delay' CSS
+        property to a calculated value does not crash and works as intended.
+
+        * fast/css/transition-delay-calculated-value-expected.txt: Added.
+        * fast/css/transition-delay-calculated-value.html: Added.
+
 2014-11-20  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Chris Dumez  <cdumez@apple.com>
+
+        Crash when setting 'transition-delay' CSS property to a calculated value
+        https://bugs.webkit.org/show_bug.cgi?id=138784
+
+        Reviewed by Sam Weinig.
+
+        Update CSSPrimitiveValue::computeTime() to use primitiveType() instead
+        of m_primitiveUnitType so that it properly handles calculated values.
+        Without this, we would hit the ASSERT_NOT_REACHED() assertion in
+        computeTime() for calculated values.
+
+        Test: fast/css/transition-delay-calculated-value.html
+
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::computeTime):
+
 2014-11-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/css/CSSPrimitiveValue.h

@@ -260 +260 @@
     template <typename T, TimeUnit timeUnit> T computeTime()
     {
-        if (timeUnit == Seconds && m_primitiveUnitType == CSS_S)
+        if (timeUnit == Seconds && primitiveType() == CSS_S)
             return getValue<T>();
-        if (timeUnit == Seconds && m_primitiveUnitType == CSS_MS)
+        if (timeUnit == Seconds && primitiveType() == CSS_MS)
             return getValue<T>() / 1000;
-        if (timeUnit == Milliseconds && m_primitiveUnitType == CSS_MS)
+        if (timeUnit == Milliseconds && primitiveType() == CSS_MS)
             return getValue<T>();
-        if (timeUnit == Milliseconds && m_primitiveUnitType == CSS_S)
+        if (timeUnit == Milliseconds && primitiveType() == CSS_S)
             return getValue<T>() * 1000;
         ASSERT_NOT_REACHED();