Attachment 97056 Details for Bug 62159 – patch

[patch] patch

Patch (text/plain), 1.72 KB, created by Jason Liu on 2011-06-13 19:31:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Liu

Created: 2011-06-13 19:31:06 PDT

Size: 1.72 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 2849e69..73389d7 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2011-06-14  Jason Liu  <jason.liu@torchmobile.com.cn>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Implement montonicallyIncreasingClock() on Qt
>+        https://bugs.webkit.org/show_bug.cgi?id=62159
>+
>+        * JavaScriptCore.pri:
>+        * wtf/CurrentTime.cpp:
>+        (WTF::monotonicallyIncreasingClock):
>+
> 2011-06-12  Patrick Gansterer  <paroga@webkit.org>
> 
>         Unreviewed. Build fix for !ENABLE(JIT) after r88604.
>diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
>index c0a1d1a..7d0f4ae 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.pri
>+++ b/Source/JavaScriptCore/JavaScriptCore.pri
>@@ -97,6 +97,10 @@ defineTest(prependJavaScriptCoreLib) {
>     win32-* {
>         LIBS += -lwinmm
>     }
>+    
>+    unix {
>+        LIBS += -lrt
>+    }
> 
>     # The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies.
>     # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit and QtScript
>diff --git a/Source/JavaScriptCore/wtf/CurrentTime.cpp b/Source/JavaScriptCore/wtf/CurrentTime.cpp
>index e42dabb..818e4e5 100644
>--- a/Source/JavaScriptCore/wtf/CurrentTime.cpp
>+++ b/Source/JavaScriptCore/wtf/CurrentTime.cpp
>@@ -295,6 +295,13 @@ double currentTime()
>     return now.tv_sec + now.tv_usec / 1000000.0;
> }
> 
>+double monotonicallyIncreasingClock()
>+{
>+    struct timespec current;
>+    clock_gettime(CLOCK_MONOTONIC, &current);
>+    return current.tv_sec + (current.tv_nsec / 1000000000.0);
>+}
>+
> #endif
> 
> #if PLATFORM(MAC)

Actions: View | Formatted Diff | Diff

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