Changeset 16855 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 6, 2006, 11:16:38 AM (19 years ago)

Author:

kmccullo

Message:

Reviewed by Brady.

DST and TimeZones were wrong in some cases, specifically on some of the dates where DST changes.

• kjs/DateMath.cpp: (KJS::equivalentYearForDST): (KJS::getUTCOffset): (KJS::getDSTOffsetSimple): (KJS::getDSTOffset): (KJS::dateToMseconds): (KJS::msToTM):
• kjs/DateMath.h:
• kjs/date_object.cpp: (KJS::gmtoffset):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/DateMath.cpp (modified) (8 diffs)
• kjs/DateMath.h (modified) (1 diff)
• kjs/date_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-10-06  Kevin McCullough  <[email protected]>
+
+        Reviewed by Brady.
+
+        DST and TimeZones were wrong in some cases, specifically on some of the dates where DST changes.
+
+        * kjs/DateMath.cpp:
+        (KJS::equivalentYearForDST):
+        (KJS::getUTCOffset):
+        (KJS::getDSTOffsetSimple):
+        (KJS::getDSTOffset):
+        (KJS::dateToMseconds):
+        (KJS::msToTM):
+        * kjs/DateMath.h:
+        * kjs/date_object.cpp:
+        (KJS::gmtoffset):
+
 2006-10-05  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -304 +304 @@
 
     day = (int) daysFrom1970ToYear(year) + 4;
-    day = day % 7;
+    day %= 7;
 
     if (day < 0)
@@ -330 +330 @@
         ltime.tm_isdst = 0;
 
-        /* get the difference between this time zone and GMT */
+        // get the difference between this time zone and GMT 
         ltime.tm_mday = 2;
         ltime.tm_year = 70;
@@ -356 +356 @@
     if(localTimeSeconds > maxUnixTime)
         localTimeSeconds = maxUnixTime;
-    else if(localTimeSeconds < 0) /*go ahead a day to make localtime work (does not work with 0) */
-        localTimeSeconds = secondsPerDay;
-
+    else if(localTimeSeconds < 0) // Go ahead a day to make localtime work (does not work with 0)
+        localTimeSeconds += secondsPerDay;
+
+    struct tm prtm;
     double offsetTime = (localTimeSeconds * usecPerMsec) + getUTCOffset() ;
 
-    struct tm prtm;
+    prtm.tm_hour  =  msToHours(offsetTime);
     prtm.tm_min   =  msToMinutes(offsetTime);
-    prtm.tm_hour  =  msToHours(offsetTime);
 
     // FIXME: time_t has a potential problem in 2038
@@ -399 +399 @@
     }
 
-    /* put our ms in an LL, and map it to usec for prtime */
     return getDSTOffsetSimple(ms / usecPerMsec);
-}
-
-static inline double localTimeToUTC(double ms)
-{
-    ms -= getUTCOffset();
-    ms -= getDSTOffset(ms);
-    return ms;
-}
-
-static inline double UTCToLocalTime(double ms)
-{
-    ms += getUTCOffset();
-    ms += getDSTOffset(ms);
-    return ms;
 }
 
@@ -423 +408 @@
     double result = (day * msPerDay) + msec_time;
 
-    if(!inputIsUTC)
-        result = localTimeToUTC(result);
+    if(!inputIsUTC) { // convert to UTC
+        result -= getUTCOffset();
+        result -= getDSTOffset(result);
+    }
 
     return result;
@@ -431 +418 @@
 void msToTM(double ms, bool outputIsUTC, struct tm& tm)
 {
-    //input is UTC
-    if(!outputIsUTC)
-        ms = UTCToLocalTime(ms);
+    // input is UTC
+    double dstOff = 0.0;
+    
+    if(!outputIsUTC) {  // convert to local time
+        dstOff = getDSTOffset(ms);
+        ms += dstOff + getUTCOffset();
+    }
 
     tm.tm_sec   =  msToSeconds(ms);
@@ -443 +434 @@
     tm.tm_mon   =  msToMonth(ms);
     tm.tm_year  =  msToYear(ms) - 1900;
-    tm.tm_isdst =  isDST(ms);
-
-    //everyone else seems to have these fields
+    tm.tm_isdst =  dstOff != 0.0;
+
+    // All other OS' seems to have these fields
 #if !PLATFORM(WIN_OS)
     struct tm xtm;
@@ -456 +447 @@
 }
 
-bool isDST(const double& ms)
-{
-    return getDSTOffset(ms) != 0;
-}
-
-}   //namespace KJS
-
+}   // namespace KJS
+

trunk/JavaScriptCore/kjs/DateMath.h

@@ -62 +62 @@
 void msToTM(double, bool outputIsUTC, struct tm& );
 double dateToMseconds(tm*, double, bool inputIsUTC);
-bool isDST(const double&);
 double getUTCOffset();
 

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -70 +70 @@
 #if PLATFORM(WIN_OS)
     // Time is supposed to be in the current timezone.
-    static int utcOffset = static_cast<int>(getUTCOffset()/1000.0);
-    return utcOffset;
+    return -(_timezone / 60 - (t.tm_isdst != 0 ? 60 : 0 )) * 60;
 #else
     return t.tm_gmtoff;