[webkit-changes] cvs commit: JavaScriptCore/kjs date_object.cpp

[Timothy]

thatcher    05/10/03 15:45:01

  Modified:    .        Tag: Safari-Den-branch ChangeLog
               kjs      Tag: Safari-Den-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.34.2.13 +18 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.677.6.34.2.12
  retrieving revision 1.677.6.34.2.13
  diff -u -r1.677.6.34.2.12 -r1.677.6.34.2.13
  --- ChangeLog	1 Oct 2005 06:14:29 -0000	1.677.6.34.2.12
  +++ ChangeLog	3 Oct 2005 22:44:56 -0000	1.677.6.34.2.13
  @@ -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.
  +
   === JavaScriptCore-416.12 ===
   
   2005-09-30  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.39.8.1.2.4 +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.1.2.3
  retrieving revision 1.39.8.1.2.4
  diff -u -r1.39.8.1.2.3 -r1.39.8.1.2.4
  --- date_object.cpp	30 Sep 2005 17:45:41 -0000	1.39.8.1.2.3
  +++ date_object.cpp	3 Oct 2005 22:45:00 -0000	1.39.8.1.2.4
  @@ -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;