diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
| commit | a8e0e5656f09130e68c10209429a0870b38248c4 (patch) | |
| tree | 9f2c51be485c3f1e4afea821ebbe838a08c0ce2d /src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp | |
| parent | 8fbdbd25015a4e5544dace3a77427861f0ca89f4 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-a8e0e5656f09130e68c10209429a0870b38248c4.zip Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.gz Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.bz2 | |
Merge branch '4.6' into core-4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp index 0386494..2110432 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp @@ -501,13 +501,13 @@ double gregorianDateTimeToMS(const GregorianDateTime& t, double milliSeconds, bo return result; } +// input is UTC void msToGregorianDateTime(double ms, bool outputIsUTC, GregorianDateTime& tm) { - // input is UTC double dstOff = 0.0; - const double utcOff = getUTCOffset(); - - if (!outputIsUTC) { // convert to local time + double utcOff = 0.0; + if (!outputIsUTC) { + utcOff = getUTCOffset(); dstOff = getDSTOffset(ms, utcOff); ms += dstOff + utcOff; } @@ -522,8 +522,7 @@ void msToGregorianDateTime(double ms, bool outputIsUTC, GregorianDateTime& tm) tm.month = monthFromDayInYear(tm.yearDay, isLeapYear(year)); tm.year = year - 1900; tm.isDST = dstOff != 0.0; - - tm.utcOffset = outputIsUTC ? 0 : static_cast<long>((dstOff + utcOff) / msPerSecond); + tm.utcOffset = static_cast<long>((dstOff + utcOff) / msPerSecond); tm.timeZone = NULL; } |