[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 b45937de822391382d6606d36f83c8220426e903
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 8 21:02:20 2009 +0000

    For the change in DateMath.
    
    Reviewed by NOBODY (chromium build fix).
    
    * config.h:
    * wtf/DateMath.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50628 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c573ba6..03163ab 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-08  David Levin  <levin at chromium.org>
+
+        Reviewed by NOBODY (chromium build fix).
+
+        For the change in DateMath.
+
+        * config.h:
+        * wtf/DateMath.cpp:
+
 2009-11-06  Geoffrey Garen  <ggaren at apple.com>
 
         Windows build fix: export some symbols.
diff --git a/JavaScriptCore/config.h b/JavaScriptCore/config.h
index 6681761..a6a6f0a 100644
--- a/JavaScriptCore/config.h
+++ b/JavaScriptCore/config.h
@@ -74,3 +74,15 @@
 #include <wtf/DisallowCType.h>
 #endif
 
+#if PLATFORM(CHROMIUM)
+#if !defined(WTF_USE_V8)
+#define WTF_USE_V8 1
+#endif
+#endif /* PLATFORM(CHROMIUM) */
+
+#if !defined(WTF_USE_V8)
+#define WTF_USE_V8 0
+#endif /* !defined(WTF_USE_V8) */
+
+/* Using V8 implies not using JSC and vice versa */
+#define WTF_USE_JSC !WTF_USE_V8
diff --git a/JavaScriptCore/wtf/DateMath.cpp b/JavaScriptCore/wtf/DateMath.cpp
index 3772e5c..46bc152 100644
--- a/JavaScriptCore/wtf/DateMath.cpp
+++ b/JavaScriptCore/wtf/DateMath.cpp
@@ -50,8 +50,6 @@
 #include "MathExtras.h"
 #include "StringExtras.h"
 
-#include "CallFrame.h"
-
 #include <algorithm>
 #include <limits.h>
 #include <limits>
@@ -76,6 +74,10 @@ extern "C" struct tm * localtime(const time_t *timer);
 #include <sys/timeb.h>
 #endif
 
+#if USE(JSC)
+#include "CallFrame.h"
+#endif
+
 #define NaN std::numeric_limits<double>::quiet_NaN()
 
 using namespace WTF;
@@ -377,6 +379,7 @@ static int32_t calculateUTCOffset()
     return static_cast<int32_t>(utcOffset * 1000);
 }
 
+#if USE(JSC)
 /*
  * Get the difference in milliseconds between this time zone and UTC (GMT)
  * NOT including DST.
@@ -389,6 +392,7 @@ double getUTCOffset(ExecState* exec)
     exec->globalData().cachedUTCOffset = calculateUTCOffset();
     return exec->globalData().cachedUTCOffset;
 }
+#endif
 
 /*
  * Get the DST offset for the time passed in.  Takes

-- 
WebKit Debian packaging