| Differences between
and this patch
- a/Source/JavaScriptCore/ChangeLog +10 lines
Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
1
2011-12-21  Pierre Rossi  <pierre.rossi@gmail.com>
2
3
        Implement montonicallyIncreasingClock() on Qt
4
        https://bugs.webkit.org/show_bug.cgi?id=62159
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * wtf/CurrentTime.cpp:
9
        (WTF::monotonicallyIncreasingTime):
10
1
2011-12-20  Filip Pizlo  <fpizlo@apple.com>
11
2011-12-20  Filip Pizlo  <fpizlo@apple.com>
2
12
3
        32_64 baseline JIT should attempt to convert division results to integers, and record when that fails
13
        32_64 baseline JIT should attempt to convert division results to integers, and record when that fails
- a/Source/JavaScriptCore/wtf/CurrentTime.cpp +13 lines
Lines 66-71 extern "C" time_t mktime(struct tm *t); a/Source/JavaScriptCore/wtf/CurrentTime.cpp_sec1
66
#include <sys/time.h>
66
#include <sys/time.h>
67
#endif
67
#endif
68
68
69
#if PLATFORM(QT)
70
#include <QElapsedTimer>
71
#endif
72
69
#if PLATFORM(CHROMIUM)
73
#if PLATFORM(CHROMIUM)
70
#error Chromium uses a different timer implementation
74
#error Chromium uses a different timer implementation
71
#endif
75
#endif
Lines 317-322 double monotonicallyIncreasingTime() a/Source/JavaScriptCore/wtf/CurrentTime.cpp_sec2
317
    return static_cast<double>(g_get_monotonic_time() / 1000000.0);
321
    return static_cast<double>(g_get_monotonic_time() / 1000000.0);
318
}
322
}
319
323
324
#elif PLATFORM(QT)
325
326
double monotonicallyIncreasingTime()
327
{
328
    ASSERT(QElapsedTimer::isMonotonic());
329
    static QElapsedTimer timer;
330
    return timer.elapsed() / msPerSecond;
331
}
332
320
#else
333
#else
321
334
322
double monotonicallyIncreasingTime()
335
double monotonicallyIncreasingTime()

Return to Bug 62159