From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/JavaScriptCore/debugger/Debugger.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/debugger/Debugger.cpp') diff --git a/Source/JavaScriptCore/debugger/Debugger.cpp b/Source/JavaScriptCore/debugger/Debugger.cpp index 0a66d6f34..5d7a9b109 100644 --- a/Source/JavaScriptCore/debugger/Debugger.cpp +++ b/Source/JavaScriptCore/debugger/Debugger.cpp @@ -59,7 +59,7 @@ inline Recompiler::~Recompiler() // JavaScript in the inspector. SourceProviderMap::const_iterator end = m_sourceProviders.end(); for (SourceProviderMap::const_iterator iter = m_sourceProviders.begin(); iter != end; ++iter) - m_debugger->sourceParsed(iter->second, iter->first, -1, UString()); + m_debugger->sourceParsed(iter->second, iter->first, -1, String()); } inline void Recompiler::operator()(JSCell* cell) @@ -78,9 +78,9 @@ inline void Recompiler::operator()(JSCell* cell) if (!m_functionExecutables.add(executable).isNewEntry) return; - ExecState* exec = function->scope()->globalObject->JSGlobalObject::globalExec(); + ExecState* exec = function->scope()->globalObject()->JSGlobalObject::globalExec(); executable->clearCodeIfNotCompiling(); - if (m_debugger == function->scope()->globalObject->debugger()) + if (m_debugger == function->scope()->globalObject()->debugger()) m_sourceProviders.add(executable->source().provider(), exec); } @@ -121,7 +121,7 @@ void Debugger::recompileAllJSFunctions(JSGlobalData* globalData) globalData->heap.objectSpace().forEachCell(recompiler); } -JSValue evaluateInGlobalCallFrame(const UString& script, JSValue& exception, JSGlobalObject* globalObject) +JSValue evaluateInGlobalCallFrame(const String& script, JSValue& exception, JSGlobalObject* globalObject) { CallFrame* globalCallFrame = globalObject->globalExec(); JSGlobalData& globalData = globalObject->globalData(); @@ -133,7 +133,7 @@ JSValue evaluateInGlobalCallFrame(const UString& script, JSValue& exception, JSG return exception; } - JSValue result = globalData.interpreter->execute(eval, globalCallFrame, globalObject, globalCallFrame->scopeChain()); + JSValue result = globalData.interpreter->execute(eval, globalCallFrame, globalObject, globalCallFrame->scope()); if (globalData.exception) { exception = globalData.exception; globalData.exception = JSValue(); -- cgit v1.2.1