Changeset 16798 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 4, 2006, 6:42:00 PM (19 years ago)

Author:

kmccullo

Message:

Reviewed by Adam.

• Removed an unnecessary assert that was stopping many pages. tm_gmtoff was not set for UTC time in mozilla but is always set for us.

• kjs/DateMath.cpp: (KJS::getUTCOffset): (KJS::msToTM):
• kjs/date_object.cpp: (KJS::gmtoffset): (KJS::formatTime):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/DateMath.cpp (modified) (3 diffs)
• kjs/date_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-10-04  Kevin McCullough  <[email protected]>
+
+        Reviewed by Adam.
+
+        - Removed an unnecessary assert that was stopping many pages.  tm_gmtoff was not set for UTC time in mozilla but is always set for us.
+
+        * kjs/DateMath.cpp:
+        (KJS::getUTCOffset):
+        (KJS::msToTM):
+        * kjs/date_object.cpp:
+        (KJS::gmtoffset):
+        (KJS::formatTime):
+
 2006-10-04  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -334 +334 @@
         ltime.tm_year = 70;
 
-        #if !PLATFORM(WIN_OS)
+#if !PLATFORM(WIN_OS)
         ltime.tm_zone = 0;
         ltime.tm_gmtoff = 0;
-        #endif
+#endif
 
         utcOffset = mktime(&ltime) - (hoursPerDay * secondsPerHour);
@@ -446 +446 @@
 
     //everyone else seems to have these fields
-    #if !PLATFORM(WIN_OS)
+#if !PLATFORM(WIN_OS)
     struct tm xtm;
     // FIXME: time_t has a potential problem in 2038
@@ -453 +453 @@
     tm.tm_gmtoff = xtm.tm_gmtoff;
     tm.tm_zone = xtm.tm_zone;
-    #endif
+#endif
 }
 

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -70 +70 @@
 #if PLATFORM(WIN_OS)
     // Time is supposed to be in the current timezone.
-    return static_cast<int>(getUTCOffset()/1000.0);
+    static int utcOffset = static_cast<int>(getUTCOffset()/1000.0);
+    return utcOffset;
 #else
     return t.tm_gmtoff;
@@ -184 +185 @@
     char buffer[100];
     if (utc) {
-#if !PLATFORM(WIN_OS)   //win doesn't have the tm_gtoff member
-        ASSERT(t.tm_gmtoff == 0);
-#endif
         snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT", t.tm_hour, t.tm_min, t.tm_sec);
     } else {