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

Timestamp:

Oct 12, 2006, 10:58:09 AM (19 years ago)

Author:

kmccullo

Message:

Reviewed by Geoff.

Added our own tm struct to have a consistent set of fields, which lets us display the DST offset and timezone strings correctly. Also there is some code cleanup.

• kjs/DateMath.cpp: (KJS::timeToMS): (KJS::getUTCOffset): (KJS::getDSTOffsetSimple): (KJS::dateToMS): (KJS::msToTM): (KJS::tmToKJStm): (KJS::KJStmToTm):
• kjs/DateMath.h:
• kjs/date_object.cpp: (KJS::gmtoffset): (KJS::formatTime): (KJS::DateProtoFunc::callAsFunction): (KJS::DateObjectImp::construct): (KJS::DateObjectImp::callAsFunction): (KJS::DateObjectFuncImp::callAsFunction): (KJS::parseDate):
• kjs/date_object.h:

File:

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

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -68 +68 @@
 inline int gmtoffset(const tm& t)
 {
-#if PLATFORM(WIN_OS)
-    // Time is supposed to be in the current timezone.
-    return -(_timezone / 60 - (t.tm_isdst != 0 ? 60 : 0 )) * 60;
-#else
     return t.tm_gmtoff;
-#endif
 }
 
@@ -187 +182 @@
     } else {
         int offset = abs(gmtoffset(t));
-#if PLATFORM(WIN_OS)
         char tzname[70];
-        strftime(tzname, sizeof(tzname), "%Z", &t);
-#else
-        const char *tzname = t.tm_zone;
-#endif
+        struct ::tm gtm = KJStmToTm(t);
+        strftime(tzname, sizeof(tzname), "%Z", &gtm);
+
         if (tzname) {
             snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT%c%02d%02d (%s)",
@@ -487 +480 @@
     break;
 #else
-  case ToLocaleString:
-    strftime(timebuffer, bufsize, "%c", &t);
+  case ToLocaleString: {
+    struct ::tm gtm = KJStmToTm(t);
+    strftime(timebuffer, bufsize, "%c", &gtm);
     return jsString(timebuffer);
     break;
-  case ToLocaleDateString:
-    strftime(timebuffer, bufsize, "%x", &t);
+    }
+  case ToLocaleDateString: {
+    struct ::tm gtm = KJStmToTm(t);
+    strftime(timebuffer, bufsize, "%x", &gtm);
     return jsString(timebuffer);
     break;
-  case ToLocaleTimeString:
-    strftime(timebuffer, bufsize, "%X", &t);
+    }
+  case ToLocaleTimeString: {
+    struct ::tm gtm = KJStmToTm(t);
+    strftime(timebuffer, bufsize, "%X", &gtm);
     return jsString(timebuffer);
     break;
+    }
 #endif
   case ValueOf:
@@ -560 +559 @@
       id == SetMinutes || id == SetHours || id == SetDate ||
       id == SetMonth || id == SetFullYear ) {
-    result = jsNumber(dateToMseconds(&t, ms, utc));
+    result = jsNumber(dateToMS(t, ms, utc));
     thisDateObj->setInternalValue(result);
   }
@@ -647 +646 @@
       t.tm_isdst = -1;
       double ms = (numArgs >= 7) ? roundValue(exec, args[6]) : 0;
-      value = dateToMseconds(&t, ms, false);
+      value = dateToMS(t, ms, false);
     }
   }
@@ -660 +659 @@
 {
     time_t t = time(0);
-    tm ts = *localtime(&t);
+    tm ts = tmToKJStm(*localtime(&t));
     return jsString(formatDate(ts) + " " + formatTime(ts, false));
 }
@@ -700 +699 @@
     t.tm_sec = (n >= 6) ? args[5]->toInt32(exec) : 0;
     double ms = (n >= 7) ? roundValue(exec, args[6]) : 0;
-    return jsNumber(dateToMseconds(&t, ms, true));
+    return jsNumber(dateToMS(t, ms, true));
   }
 }
@@ -1067 +1066 @@
         t.tm_hour = hour;
 
-        // Use our dateToMseconds() rather than mktime() as the latter can't handle the full year range.
-        return dateToMseconds(&t, 0, false);
+        // Use our dateToMS() rather than mktime() as the latter can't handle the full year range.
+        return dateToMS(t, 0, false);
     }