[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[levin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5a4ae7e8f4034437f160af3b1531c89769c0513d
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 9 02:43:51 2009 +0000

    * wtf/DateMath.cpp:
    (WTF::parseDateFromNullTerminatedCharacters):
    (JSC::gregorianDateTimeToMS):
    (JSC::msToGregorianDateTime):
    (JSC::parseDateFromNullTerminatedCharacters):
    * wtf/DateMath.h:
    (JSC::GregorianDateTime::GregorianDateTime):
    
    Reviewed by NOBODY (speculative snow leopard and windows build fixes).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cb3d4a1..03fc1ef 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
 2009-11-08  David Levin  <levin at chromium.org>
 
+        Reviewed by NOBODY (speculative snow leopard and windows build fixes).
+
+        * wtf/DateMath.cpp:
+        (WTF::parseDateFromNullTerminatedCharacters):
+        (JSC::gregorianDateTimeToMS):
+        (JSC::msToGregorianDateTime):
+        (JSC::parseDateFromNullTerminatedCharacters):
+        * wtf/DateMath.h:
+        (JSC::GregorianDateTime::GregorianDateTime):
+
+2009-11-08  David Levin  <levin at chromium.org>
+
         Reviewed by NOBODY (chromium build fix).
         
         Hopefully, the last build fix.
diff --git a/JavaScriptCore/wtf/DateMath.cpp b/JavaScriptCore/wtf/DateMath.cpp
index 354de25..e797dde 100644
--- a/JavaScriptCore/wtf/DateMath.cpp
+++ b/JavaScriptCore/wtf/DateMath.cpp
@@ -523,7 +523,7 @@ static bool parseLong(const char* string, char** stopPosition, int base, long* r
 }
 
 // Odd case where 'exec' is allowed to be 0, to accomodate a caller in WebCore.
-double parseDateFromNullTerminatedCharacters(const char* dateString, bool& haveTZ, int& offset)
+static double parseDateFromNullTerminatedCharacters(const char* dateString, bool& haveTZ, int& offset)
 {
     haveTZ = false;
     offset = 0;
@@ -837,7 +837,7 @@ double gregorianDateTimeToMS(ExecState* exec, const GregorianDateTime& t, double
 {
     int day = dateToDayInYear(t.year + 1900, t.month, t.monthDay);
     double ms = timeToMS(t.hour, t.minute, t.second, milliSeconds);
-    double result = (day * msPerDay) + ms;
+    double result = (day * WTF::msPerDay) + ms;
 
     if (!inputIsUTC) { // convert to UTC
         double utcOffset = getUTCOffset(exec);
@@ -869,7 +869,7 @@ void msToGregorianDateTime(ExecState* exec, double ms, bool outputIsUTC, Gregori
     tm.month    =  monthFromDayInYear(tm.yearDay, isLeapYear(year));
     tm.year     =  year - 1900;
     tm.isDST    =  dstOff != 0.0;
-    tm.utcOffset = static_cast<long>((dstOff + utcOff) / msPerSecond);
+    tm.utcOffset = static_cast<long>((dstOff + utcOff) / WTF::msPerSecond);
     tm.timeZone = NULL;
 }
 
@@ -883,9 +883,9 @@ double parseDateFromNullTerminatedCharacters(const char* dateString, ExecState*
     if (!haveTZ) {
         double utcOffset = getUTCOffset(exec);
         double dstOffset = getDSTOffset(ms, utcOffset);
-        offset = static_cast<int>((utcOffset + dstOffset) / msPerMinute);
+        offset = static_cast<int>((utcOffset + dstOffset) / WTF::msPerMinute);
     }
-    return ms - (offset * msPerMinute);
+    return ms - (offset * WTF::msPerMinute);
 }
 
 } // namespace JSC
diff --git a/JavaScriptCore/wtf/DateMath.h b/JavaScriptCore/wtf/DateMath.h
index 485ca9f..e1293db 100644
--- a/JavaScriptCore/wtf/DateMath.h
+++ b/JavaScriptCore/wtf/DateMath.h
@@ -125,7 +125,7 @@ struct GregorianDateTime : Noncopyable {
 #if HAVE(TM_GMTOFF)
         utcOffset = static_cast<int>(inTm.tm_gmtoff);
 #else
-        utcOffset = static_cast<int>(getUTCOffset(exec) / msPerSecond + (isDST ? secondsPerHour : 0));
+        utcOffset = static_cast<int>(getUTCOffset(exec) / WTF::msPerSecond + (isDST ? WTF::secondsPerHour : 0));
 #endif
 
 #if HAVE(TM_ZONE)

-- 
WebKit Debian packaging