Changeset 50377 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Oct 30, 2009, 7:11:21 PM (16 years ago)

Author:

[email protected]

Message:

Fixed failing layout test: restore a special case I accidentally deleted.

Patch by Geoffrey Garen <​[email protected]> on 2009-10-30
Reviewed by Oliver Hunt.

• runtime/DatePrototype.cpp:

(JSC::setNewValueFromDateArgs): In the case of applying a change to a date
that is NaN, reset the date to 0 *and* then apply the change; don't just
reset the date to 0.

File:

• trunk/JavaScriptCore/runtime/DatePrototype.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/DatePrototype.cpp

@@ -861 +861 @@
     
     double milli = thisDateObj->internalNumber();
-    if (numArgsToUse == 3 && isnan(milli)) {
-        JSValue result = jsNumber(exec, 0);
-        thisDateObj->setInternalValue(result);
-        return result;
+    double ms = 0; 
+
+    GregorianDateTime gregorianDateTime; 
+    if (numArgsToUse == 3 && isnan(milli)) 
+        WTF::msToGregorianDateTime(0, true, gregorianDateTime); 
+    else { 
+        ms = milli - floor(milli / msPerSecond) * msPerSecond; 
+        const GregorianDateTime* other = thisDateObj->gregorianDateTime(exec, inputIsUTC);
+        if (!other)
+            return jsNaN(exec);
+        gregorianDateTime.copyFrom(*other);
     }
-
-    const GregorianDateTime* other = thisDateObj->gregorianDateTime(exec, inputIsUTC);
-    if (!other)
-        return jsNaN(exec);
-
-    GregorianDateTime gregorianDateTime;
-    gregorianDateTime.copyFrom(*other);
-    
-    double ms = milli - floor(milli / msPerSecond) * msPerSecond;
+    
     if (!fillStructuresUsingDateArgs(exec, args, numArgsToUse, &ms, &gregorianDateTime)) {
         JSValue result = jsNaN(exec);