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/debugger/DebuggerActivation.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/debugger/DebuggerActivation.cpp') diff --git a/Source/JavaScriptCore/debugger/DebuggerActivation.cpp b/Source/JavaScriptCore/debugger/DebuggerActivation.cpp index e23468035..eec2d6bd7 100644 --- a/Source/JavaScriptCore/debugger/DebuggerActivation.cpp +++ b/Source/JavaScriptCore/debugger/DebuggerActivation.cpp @@ -27,6 +27,7 @@ #include "DebuggerActivation.h" #include "JSActivation.h" +#include "Operations.h" namespace JSC { @@ -34,17 +35,17 @@ ASSERT_HAS_TRIVIAL_DESTRUCTOR(DebuggerActivation); const ClassInfo DebuggerActivation::s_info = { "DebuggerActivation", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(DebuggerActivation) }; -DebuggerActivation::DebuggerActivation(JSGlobalData& globalData) - : JSNonFinalObject(globalData, globalData.debuggerActivationStructure.get()) +DebuggerActivation::DebuggerActivation(VM& vm) + : JSNonFinalObject(vm, vm.debuggerActivationStructure.get()) { } -void DebuggerActivation::finishCreation(JSGlobalData& globalData, JSObject* activation) +void DebuggerActivation::finishCreation(VM& vm, JSObject* activation) { - Base::finishCreation(globalData); + Base::finishCreation(vm); ASSERT(activation); ASSERT(activation->isActivationObject()); - m_activation.set(globalData, this, jsCast(activation)); + m_activation.set(vm, this, jsCast(activation)); } void DebuggerActivation::visitChildren(JSCell* cell, SlotVisitor& visitor) -- cgit v1.2.1