Changeset 35879 in webkit

Timestamp:

Aug 21, 2008 4:35:23 PM (16 years ago)

Author:

dino@apple.com

Message:

2008-08-21 Chris Marrin <​cmarrin@apple.com>

Allow 0 (without units) for Time eg. duration
Fix for ​https://bugs.webkit.org/show_bug.cgi?id=20467

Reviewed by Dave Hyatt.

Test: css1/units/zero-duration-without-units.html

• css/CSSParser.cpp: (WebCore::CSSParser::validUnit):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css1/units/zero-duration-without-units-expected.txt (added)
• LayoutTests/css1/units/zero-duration-without-units.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-08-21  Chris Marrin  <cmarrin@apple.com>
+
+        Allow 0 (without units) for Time eg. duration
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=20467
+
+        Reviewed by Dave Hyatt.
+
+        * css1/units/zero-duration-without-units-expected.txt: Added.
+        * css1/units/zero-duration-without-units.html: Added.
+
 2008-08-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-21  Chris Marrin  <cmarrin@apple.com>
+
+        Allow 0 (without units) for Time eg. duration
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=20467
+
+        Reviewed by Dave Hyatt.
+
+        Test: css1/units/zero-duration-without-units.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::validUnit):
+
 2008-08-21  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/css/CSSParser.cpp

@@ -409 +409 @@
     case CSSPrimitiveValue::CSS_NUMBER:
         b = (unitflags & FNumber);
-        if (!b && ((unitflags & (FLength | FAngle)) && (value->fValue == 0 || !strict))) {
-            value->unit = (unitflags & FLength) ? CSSPrimitiveValue::CSS_PX : CSSPrimitiveValue::CSS_DEG;
+        if (!b && ((unitflags & (FLength | FAngle | FTime)) && (value->fValue == 0 || !strict))) {
+            value->unit = (unitflags & FLength) ? CSSPrimitiveValue::CSS_PX :
+                          ((unitflags & FAngle) ? CSSPrimitiveValue::CSS_DEG : CSSPrimitiveValue::CSS_S);
             b = true;
         }