Changeset 10571 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Sep 20, 2005, 1:07:57 AM (20 years ago)

Author:

ggaren

Message:

• Rolled in fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5053 Need to restore int/long changes to simple_number.h

Test cases added:

• layout-tests/fast/js/date-big-constructor-expected.txt: Added.
• layout-tests/fast/js/date-big-constructor.html: Added.

Reviewed by darin.

• kjs/date_object.cpp: (KJS::fillStructuresUsingDateArgs): (KJS::makeTime):

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -466 +466 @@
   // months
   if (maxArgs >= 2 && idx < numArgs) {
-    int months = args[idx++]->toInt32(exec);
-
-    // t->tm_year must hold the bulk of the data to avoid overflow when converting
-    // to a CFGregorianDate. (CFGregorianDate.month is an SInt8; CFGregorianDate.year is an SInt32.)
-    t->tm_year += months / 12;
-    t->tm_mon = months % 12;
+    t->tm_mon = args[idx++]->toInt32(exec);
   }
   
@@ -1015 +1010 @@
     int utcOffset;
     if (utc) {
-        time_t zero = 0;
+        time_t zero = 0;
 #if defined BSD || defined(__linux__) || defined(__APPLE__)
         struct tm t3;
@@ -1031 +1026 @@
 #endif
     } else {
-        utcOffset = 0;
-        t->tm_isdst = -1;
-    }
+        utcOffset = 0;
+        t->tm_isdst = -1;
+    }
+    
+    // t->tm_year must hold the bulk of the data to avoid overflow when converting
+    // to a CFGregorianDate. (CFGregorianDate.month is an SInt8; CFGregorianDate.year is an SInt32.)
+    t->tm_year += t->tm_mon / 12;
+    t->tm_mon %= 12;
+    
 
     double yearOffset = 0.0;