Attachment 96920 Details for Bug 62159 – patch

[patch] patch

Patch (text/plain), 1.73 KB, created by Jason Liu on 2011-06-12 22:47:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Liu

Created: 2011-06-12 22:47:06 PDT

Size: 1.73 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index d438cc9..27a4053 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2011-06-13  Jason Liu  <jason.liu@torchmobile.com.cn>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Need a short description and bug URL (OOPS!)
>+
>+        * JavaScriptCore.pri:
>+        * wtf/CurrentTime.cpp:
>+        (WTF::monotonicallyIncreasingClock):
>+
> 2011-06-09  Geoffrey Garen  <ggaren@apple.com>
> 
>         Build fix: Corrected header spelling.
>diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
>index c0a1d1a..90240c4 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.pri
>+++ b/Source/JavaScriptCore/JavaScriptCore.pri
>@@ -97,6 +97,9 @@ 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..4d7b705 100644
>--- a/Source/JavaScriptCore/wtf/CurrentTime.cpp
>+++ b/Source/JavaScriptCore/wtf/CurrentTime.cpp
>@@ -310,6 +310,15 @@ double monotonicallyIncreasingTime()
>     return (mach_absolute_time() * timebaseInfo.numer) / (1.0e9 * timebaseInfo.denom);
> }
> 
>+#elif PLATFORM(QT)
>+
>+double monotonicallyIncreasingClock()
>+{
>+    struct timespec current;
>+    clock_gettime(CLOCK_MONOTONIC, &current);
>+    return current.tv_sec + (current.tv_nsec / 1000000000.0);
>+}
>+
> #else
> 
> double monotonicallyIncreasingTime()

Flags:

webkit-ews: commit-queue-

Actions: View | Formatted Diff | Diff

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