summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/heap/IncrementalSweeper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/heap/IncrementalSweeper.cpp')
-rw-r--r--Source/JavaScriptCore/heap/IncrementalSweeper.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/JavaScriptCore/heap/IncrementalSweeper.cpp b/Source/JavaScriptCore/heap/IncrementalSweeper.cpp
index 41bc7f5e4..038432a5d 100644
--- a/Source/JavaScriptCore/heap/IncrementalSweeper.cpp
+++ b/Source/JavaScriptCore/heap/IncrementalSweeper.cpp
@@ -46,15 +46,15 @@ static const double sweepTimeMultiplier = 1.0 / sweepTimeTotal;
#if USE(CF)
IncrementalSweeper::IncrementalSweeper(Heap* heap, CFRunLoopRef runLoop)
- : HeapTimer(heap->globalData(), runLoop)
+ : HeapTimer(heap->vm(), runLoop)
, m_currentBlockToSweepIndex(0)
, m_blocksToSweep(heap->m_blockSnapshot)
{
}
-IncrementalSweeper* IncrementalSweeper::create(Heap* heap)
+PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
{
- return new IncrementalSweeper(heap, CFRunLoopGetCurrent());
+ return adoptPtr(new IncrementalSweeper(heap, CFRunLoopGetCurrent()));
}
void IncrementalSweeper::scheduleTimer()
@@ -70,15 +70,15 @@ void IncrementalSweeper::cancelTimer()
#elif PLATFORM(BLACKBERRY) || PLATFORM(QT)
IncrementalSweeper::IncrementalSweeper(Heap* heap)
- : HeapTimer(heap->globalData())
+ : HeapTimer(heap->vm())
, m_currentBlockToSweepIndex(0)
, m_blocksToSweep(heap->m_blockSnapshot)
{
}
-IncrementalSweeper* IncrementalSweeper::create(Heap* heap)
+PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
{
- return new IncrementalSweeper(heap);
+ return adoptPtr(new IncrementalSweeper(heap));
}
void IncrementalSweeper::scheduleTimer()
@@ -128,7 +128,7 @@ void IncrementalSweeper::sweepNextBlock()
continue;
block->sweep();
- m_globalData->heap.objectSpace().freeOrShrinkBlock(block);
+ m_vm->heap.objectSpace().freeOrShrinkBlock(block);
return;
}
}
@@ -144,14 +144,14 @@ void IncrementalSweeper::willFinishSweeping()
{
m_currentBlockToSweepIndex = 0;
m_blocksToSweep.clear();
- if (m_globalData)
+ if (m_vm)
cancelTimer();
}
#else
-IncrementalSweeper::IncrementalSweeper(JSGlobalData* globalData)
- : HeapTimer(globalData)
+IncrementalSweeper::IncrementalSweeper(VM* vm)
+ : HeapTimer(vm)
{
}
@@ -159,9 +159,9 @@ void IncrementalSweeper::doWork()
{
}
-IncrementalSweeper* IncrementalSweeper::create(Heap* heap)
+PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
{
- return new IncrementalSweeper(heap->globalData());
+ return adoptPtr(new IncrementalSweeper(heap->vm()));
}
void IncrementalSweeper::startSweeping(Vector<MarkedBlock*>&)