From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- .../JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp') diff --git a/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp b/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp index 35b992567..d7c9d53c2 100644 --- a/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp +++ b/Source/JavaScriptCore/runtime/GCActivityCallbackBlackBerry.cpp @@ -20,29 +20,29 @@ #include "GCActivityCallback.h" #include "Heap.h" -#include "JSGlobalData.h" +#include "VM.h" #include namespace JSC { DefaultGCActivityCallback::DefaultGCActivityCallback(Heap* heap) - : GCActivityCallback(heap->globalData()) + : GCActivityCallback(heap->vm()) { } void DefaultGCActivityCallback::doWork() { - JSLock lock(SilenceAssertionsOnly); - m_globalData->heap.collect(Heap::DoNotSweep); + JSLockHolder lock(m_vm); + m_vm->heap.collect(Heap::DoNotSweep); } -void DefaultGCActivityCallback::didAllocate(size_t bytesAllocated) +void DefaultGCActivityCallback::didAllocate(size_t) { if (m_timer.started()) return; // Try using ~5% CPU time. - m_timer.start(m_globalData->heap.lastGCLength() * 20); + m_timer.start(m_vm->heap.lastGCLength() * 20); } void DefaultGCActivityCallback::willCollect() -- cgit v1.2.1