diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-22 15:31:08 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-22 15:31:08 +0100 |
| commit | e8a56c51780cd3e3a0043c4f6a8849d4c2d87dd6 (patch) | |
| tree | 85dc5ef1ce13d7e197c3bb3fd6f845ab7da93449 /Source/JavaScriptCore/heap/IncrementalSweeper.cpp | |
| parent | 68753e64d1d606d7627fae83e05863d110226c15 (diff) | |
| parent | 99783e2c7e917224da401ddbd33354c131b3a377 (diff) | |
| download | qtwebkit-e8a56c51780cd3e3a0043c4f6a8849d4c2d87dd6.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
Source/sync.profile
Change-Id: I570f2804b9e5baf6d2b5573d1030887866077124
Diffstat (limited to 'Source/JavaScriptCore/heap/IncrementalSweeper.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/IncrementalSweeper.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/heap/IncrementalSweeper.cpp b/Source/JavaScriptCore/heap/IncrementalSweeper.cpp index 4aec4dd51..41bc7f5e4 100644 --- a/Source/JavaScriptCore/heap/IncrementalSweeper.cpp +++ b/Source/JavaScriptCore/heap/IncrementalSweeper.cpp @@ -37,7 +37,7 @@ namespace JSC { -#if USE(CF) || PLATFORM(BLACKBERRY) +#if USE(CF) || PLATFORM(BLACKBERRY) || PLATFORM(QT) static const double sweepTimeSlice = .01; // seconds static const double sweepTimeTotal = .10; @@ -67,11 +67,12 @@ void IncrementalSweeper::cancelTimer() CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade); } -#elif PLATFORM(BLACKBERRY) +#elif PLATFORM(BLACKBERRY) || PLATFORM(QT) IncrementalSweeper::IncrementalSweeper(Heap* heap) : HeapTimer(heap->globalData()) , m_currentBlockToSweepIndex(0) + , m_blocksToSweep(heap->m_blockSnapshot) { } @@ -82,7 +83,11 @@ IncrementalSweeper* IncrementalSweeper::create(Heap* heap) void IncrementalSweeper::scheduleTimer() { +#if PLATFORM(QT) + m_timer.start(sweepTimeSlice * sweepTimeMultiplier * 1000, this); +#else m_timer.start(sweepTimeSlice * sweepTimeMultiplier); +#endif } void IncrementalSweeper::cancelTimer() |