Attachment 120219 Details for Bug 62159 – Patch

[patch] Patch

bug-62159-20111221233600.patch (text/plain), 1.59 KB, created by Pierre Rossi on 2011-12-21 14:36:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Rossi

Created: 2011-12-21 14:36:02 PST

Size: 1.59 KB

patch

obsolete

>Subversion Revision: 103409
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 315a88f5d4af3b4284e8ac7e448758f6928be447..df7bd65531022352cafa7803e151e70d365d4f75 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2011-12-21  Pierre Rossi  <pierre.rossi@gmail.com>
>+
>+        Implement montonicallyIncreasingClock() on Qt
>+        https://bugs.webkit.org/show_bug.cgi?id=62159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/CurrentTime.cpp:
>+        (WTF::monotonicallyIncreasingTime):
>+
> 2011-12-20  Filip Pizlo  <fpizlo@apple.com>
> 
>         32_64 baseline JIT should attempt to convert division results to integers, and record when that fails
>diff --git a/Source/JavaScriptCore/wtf/CurrentTime.cpp b/Source/JavaScriptCore/wtf/CurrentTime.cpp
>index ab5c7c1763730711db503e62c158409d27a71d1b..bd64e6d4298301ecef24d2c5851b3e52acef7d1d 100644
>--- a/Source/JavaScriptCore/wtf/CurrentTime.cpp
>+++ b/Source/JavaScriptCore/wtf/CurrentTime.cpp
>@@ -66,6 +66,10 @@ extern "C" time_t mktime(struct tm *t);
> #include <sys/time.h>
> #endif
> 
>+#if PLATFORM(QT)
>+#include <QElapsedTimer>
>+#endif
>+
> #if PLATFORM(CHROMIUM)
> #error Chromium uses a different timer implementation
> #endif
>@@ -317,6 +321,15 @@ double monotonicallyIncreasingTime()
>     return static_cast<double>(g_get_monotonic_time() / 1000000.0);
> }
> 
>+#elif PLATFORM(QT)
>+
>+double monotonicallyIncreasingTime()
>+{
>+    ASSERT(QElapsedTimer::isMonotonic());
>+    static QElapsedTimer timer;
>+    return timer.elapsed() / msPerSecond;
>+}
>+
> #else
> 
> double monotonicallyIncreasingTime()

Actions: View | Formatted Diff | Diff

Attachments on bug 62159: 96168 | 96172 | 96920 | 96928 | 97056 | 97221 | 120081 | 120219