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/Debugger.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'Source/JavaScriptCore/debugger/Debugger.cpp') diff --git a/Source/JavaScriptCore/debugger/Debugger.cpp b/Source/JavaScriptCore/debugger/Debugger.cpp index 7eda52dc8..2c5a1261a 100644 --- a/Source/JavaScriptCore/debugger/Debugger.cpp +++ b/Source/JavaScriptCore/debugger/Debugger.cpp @@ -26,6 +26,7 @@ #include "Interpreter.h" #include "JSFunction.h" #include "JSGlobalObject.h" +#include "Operations.h" #include "Parser.h" #include "Protect.h" @@ -110,34 +111,34 @@ void Debugger::detach(JSGlobalObject* globalObject) globalObject->setDebugger(0); } -void Debugger::recompileAllJSFunctions(JSGlobalData* globalData) +void Debugger::recompileAllJSFunctions(VM* vm) { // If JavaScript is running, it's not safe to recompile, since we'll end // up throwing away code that is live on the stack. - ASSERT(!globalData->dynamicGlobalObject); - if (globalData->dynamicGlobalObject) + ASSERT(!vm->dynamicGlobalObject); + if (vm->dynamicGlobalObject) return; Recompiler recompiler(this); - globalData->heap.objectSpace().forEachLiveCell(recompiler); + vm->heap.objectSpace().forEachLiveCell(recompiler); } JSValue evaluateInGlobalCallFrame(const String& script, JSValue& exception, JSGlobalObject* globalObject) { CallFrame* globalCallFrame = globalObject->globalExec(); - JSGlobalData& globalData = globalObject->globalData(); + VM& vm = globalObject->vm(); - EvalExecutable* eval = EvalExecutable::create(globalCallFrame, makeSource(script), false); + EvalExecutable* eval = EvalExecutable::create(globalCallFrame, vm.codeCache(), makeSource(script), false); if (!eval) { - exception = globalData.exception; - globalData.exception = JSValue(); + exception = vm.exception; + vm.exception = JSValue(); return exception; } - JSValue result = globalData.interpreter->execute(eval, globalCallFrame, globalObject, globalCallFrame->scope()); - if (globalData.exception) { - exception = globalData.exception; - globalData.exception = JSValue(); + JSValue result = vm.interpreter->execute(eval, globalCallFrame, globalObject, globalCallFrame->scope()); + if (vm.exception) { + exception = vm.exception; + vm.exception = JSValue(); } ASSERT(result); return result; -- cgit v1.2.1