Changeset 24710 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 27, 2007, 1:33:05 AM (18 years ago)

Author:

hausmann

Message:

Implemented currentTime() in the interpreter by using QDateTime, so that we don't need timeGetTime() on Windows and therefore also don't need to link against Winmm.dll.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/interpreter.cpp (modified) (2 diffs)
• kjs/testkjs.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-07-27  Simon Hausmann  <[email protected]>
+
+        Done with and reviewed by Lars and Zack.
+
+        Implemented currentTime() in the interpreter by using QDateTime, so that we don't need timeGetTime() on Windows and therefore also don't need to link against Winmm.dll.
+
+        * kjs/interpreter.cpp:
+        (KJS::getCurrentTime):
+        * kjs/testkjs.cpp:
+        (StopWatch::start):
+        (StopWatch::stop):
+
 2007-07-27  Simon Hausmann  <[email protected]>
 

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -62 +62 @@
 #endif
 
+#if PLATFORM(QT)
+#include <QDateTime>
+#endif
+
 namespace KJS {
 
@@ -750 +754 @@
     gettimeofday(&tv, 0);
     return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+#elif PLATFORM(QT)
+    QDateTime t = QDateTime::currentDateTime();
+    return t.toTime_t() * 1000 + t.time().msec();
 #elif PLATFORM(WIN_OS)
     return timeGetTime();

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -46 +46 @@
 #endif
 
+#if PLATFORM(QT)
+#include <QDateTime>
+#endif
+
 using namespace KJS;
 using namespace WTF;
@@ -60 +64 @@
     
 private:
-#if PLATFORM(WIN_OS)
+#if PLATFORM(QT)
+    uint m_startTime;
+    uint m_stopTime;
+#elif PLATFORM(WIN_OS)
     DWORD m_startTime;
     DWORD m_stopTime;
@@ -72 +79 @@
 void StopWatch::start()
 {
-#if PLATFORM(WIN_OS)
+#if PLATFORM(QT)
+    QDateTime t = QDateTime::currentDateTime();
+    m_startTime = t.toTime_t() * 1000 + t.time().msec();
+#elif PLATFORM(WIN_OS)
     m_startTime = timeGetTime();
 #else
@@ -81 +91 @@
 void StopWatch::stop()
 {
-#if PLATFORM(WIN_OS)
+#if PLATFORM(QT)
+    QDateTime t = QDateTime::currentDateTime();
+    m_stopTime = t.toTime_t() * 1000 + t.time().msec();
+#elif PLATFORM(WIN_OS)
     m_stopTime = timeGetTime();
 #else
@@ -90 +103 @@
 long StopWatch::getElapsedMS()
 {
-#if PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS) || PLATFORM(QT)
     return m_stopTime - m_startTime;
 #else