X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/81345200c95645a1b0d2635520f96ad55dfde63f..refs/heads/master:/inspector/ScriptCallStackFactory.cpp diff --git a/inspector/ScriptCallStackFactory.cpp b/inspector/ScriptCallStackFactory.cpp index 2f06279..f33d405 100644 --- a/inspector/ScriptCallStackFactory.cpp +++ b/inspector/ScriptCallStackFactory.cpp @@ -34,6 +34,7 @@ #include "ScriptCallStackFactory.h" #include "CallFrame.h" +#include "Exception.h" #include "JSCJSValue.h" #include "JSCInlines.h" #include "ScriptArguments.h" @@ -83,7 +84,7 @@ private: size_t m_remainingCapacityForFrameCapture; }; -PassRefPtr createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize) +Ref createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize) { if (!exec) return ScriptCallStack::create(); @@ -97,7 +98,7 @@ PassRefPtr createScriptCallStack(JSC::ExecState* exec, size_t m return ScriptCallStack::create(frames); } -PassRefPtr createScriptCallStackForConsole(JSC::ExecState* exec, size_t maxStackSize) +Ref createScriptCallStackForConsole(JSC::ExecState* exec, size_t maxStackSize) { if (!exec) return ScriptCallStack::create(); @@ -119,19 +120,19 @@ PassRefPtr createScriptCallStackForConsole(JSC::ExecState* exec static void extractSourceInformationFromException(JSC::ExecState* exec, JSObject* exceptionObject, int* lineNumber, int* columnNumber, String* sourceURL) { // FIXME: Web Inspector: Should not need to evaluate JavaScript handling exceptions - JSValue lineValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "line")); + JSValue lineValue = exceptionObject->getDirect(exec->vm(), Identifier::fromString(exec, "line")); *lineNumber = lineValue && lineValue.isNumber() ? int(lineValue.toNumber(exec)) : 0; - JSValue columnValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "column")); + JSValue columnValue = exceptionObject->getDirect(exec->vm(), Identifier::fromString(exec, "column")); *columnNumber = columnValue && columnValue.isNumber() ? int(columnValue.toNumber(exec)) : 0; - JSValue sourceURLValue = exceptionObject->getDirect(exec->vm(), Identifier(exec, "sourceURL")); - *sourceURL = sourceURLValue && sourceURLValue.isString() ? sourceURLValue.toString(exec)->value(exec) : String("undefined"); + JSValue sourceURLValue = exceptionObject->getDirect(exec->vm(), Identifier::fromString(exec, "sourceURL")); + *sourceURL = sourceURLValue && sourceURLValue.isString() ? sourceURLValue.toString(exec)->value(exec) : ASCIILiteral("undefined"); exec->clearException(); } -PassRefPtr createScriptCallStackFromException(JSC::ExecState* exec, JSC::JSValue& exception, size_t maxStackSize) +Ref createScriptCallStackFromException(JSC::ExecState* exec, JSC::Exception* exception, size_t maxStackSize) { Vector frames; - RefCountedArray stackTrace = exec->vm().exceptionStack(); + RefCountedArray stackTrace = exception->stack(); for (size_t i = 0; i < stackTrace.size() && i < maxStackSize; i++) { unsigned line; unsigned column; @@ -141,8 +142,8 @@ PassRefPtr createScriptCallStackFromException(JSC::ExecState* e } // Fallback to getting at least the line and sourceURL from the exception object if it has values and the exceptionStack doesn't. - JSObject* exceptionObject = exception.toObject(exec); - if (exception.isObject()) { + if (exception->value().isObject()) { + JSObject* exceptionObject = exception->value().toObject(exec); int lineNumber; int columnNumber; String exceptionSourceURL; @@ -161,7 +162,7 @@ PassRefPtr createScriptCallStackFromException(JSC::ExecState* e return ScriptCallStack::create(frames); } -PassRefPtr createScriptArguments(JSC::ExecState* exec, unsigned skipArgumentCount) +Ref createScriptArguments(JSC::ExecState* exec, unsigned skipArgumentCount) { Vector arguments; size_t argumentCount = exec->argumentCount();