[webkit-changes] cvs commit: JavaScriptCore/kjs date_object.cpp
Timothy
thatcher at opensource.apple.com
Mon Oct 3 15:44:27 PDT 2005
thatcher 05/10/03 15:44:26
Modified: . Tag: Safari-2-0-branch ChangeLog
kjs Tag: Safari-2-0-branch date_object.cpp
Log:
- Fixed <rdar://problem/4244084> Denver Regression: setUTC() functions don't take
into account Daylight Savings Time
Reviewed by kevin.
Fix was to roll in this change from TOT:
2005-08-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by Geoff.
* kjs/date_object.cpp:
(timetUsingCF): Fix one of the date tests my making the CF version of mktime
have the same quirk about the DST field as the real mktime.
* tests/mozilla/expected.html: Updated for newly fixed test.
Revision Changes Path
No revision
No revision
1.677.6.44 +18 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.677.6.43
retrieving revision 1.677.6.44
diff -u -r1.677.6.43 -r1.677.6.44
--- ChangeLog 1 Oct 2005 06:28:09 -0000 1.677.6.43
+++ ChangeLog 3 Oct 2005 22:44:19 -0000 1.677.6.44
@@ -1,3 +1,21 @@
+2005-10-03 Geoffrey Garen <ggaren at apple.com>
+
+ - Fixed <rdar://problem/4244084> Denver Regression: setUTC() functions don't take
+ into account Daylight Savings Time
+
+ Reviewed by kevin.
+
+ Fix was to roll in this change from TOT:
+
+ 2005-08-11 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Geoff.
+
+ * kjs/date_object.cpp:
+ (timetUsingCF): Fix one of the date tests my making the CF version of mktime
+ have the same quirk about the DST field as the real mktime.
+ * tests/mozilla/expected.html: Updated for newly fixed test.
+
2005-09-30 Timothy Hatcher <timothy at apple.com>
<rdar://problem/4277521> JS exceptions don't carry file/line information (3327)
No revision
No revision
1.39.8.5 +9 -1 JavaScriptCore/kjs/date_object.cpp
Index: date_object.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/date_object.cpp,v
retrieving revision 1.39.8.4
retrieving revision 1.39.8.5
diff -u -r1.39.8.4 -r1.39.8.5
--- date_object.cpp 30 Sep 2005 17:55:29 -0000 1.39.8.4
+++ date_object.cpp 3 Oct 2005 22:44:25 -0000 1.39.8.5
@@ -182,8 +182,16 @@
if (date.year < -2500 || date.year > 2500) {
return invalidDate;
}
-
+
CFAbsoluteTime absoluteTime = CFGregorianDateGetAbsoluteTime(date, timeZone);
+
+ if (tm->tm_isdst >= 0) {
+ if (CFTimeZoneIsDaylightSavingTime(timeZone, absoluteTime) && !tm->tm_isdst)
+ absoluteTime += 3600;
+ else if (!CFTimeZoneIsDaylightSavingTime(timeZone, absoluteTime) && tm->tm_isdst)
+ absoluteTime -= 3600;
+ }
+
CFTimeInterval interval = absoluteTime + kCFAbsoluteTimeIntervalSince1970;
if (interval > LONG_MAX) {
interval = LONG_MAX;
More information about the webkit-changes
mailing list