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 --- Source/JavaScriptCore/bytecode/SamplingTool.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/bytecode/SamplingTool.cpp') diff --git a/Source/JavaScriptCore/bytecode/SamplingTool.cpp b/Source/JavaScriptCore/bytecode/SamplingTool.cpp index a76fee179..d18dbc1ff 100644 --- a/Source/JavaScriptCore/bytecode/SamplingTool.cpp +++ b/Source/JavaScriptCore/bytecode/SamplingTool.cpp @@ -297,13 +297,13 @@ void SamplingTool::sample() s_samplingTool->doRun(); } -void SamplingTool::notifyOfScope(JSGlobalData& globalData, ScriptExecutable* script) +void SamplingTool::notifyOfScope(VM& vm, ScriptExecutable* script) { #if ENABLE(CODEBLOCK_SAMPLING) MutexLocker locker(m_scriptSampleMapMutex); - m_scopeSampleMap->set(script, adoptPtr(new ScriptSampleRecord(globalData, script))); + m_scopeSampleMap->set(script, adoptPtr(new ScriptSampleRecord(vm, script))); #else - UNUSED_PARAM(globalData); + UNUSED_PARAM(vm); UNUSED_PARAM(script); #endif } -- cgit v1.2.1