diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/bindings/js/ScriptCallStackFactory.cpp | |
parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/bindings/js/ScriptCallStackFactory.cpp')
-rw-r--r-- | WebCore/bindings/js/ScriptCallStackFactory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/bindings/js/ScriptCallStackFactory.cpp b/WebCore/bindings/js/ScriptCallStackFactory.cpp index 25fabdd..9a64ffc 100644 --- a/WebCore/bindings/js/ScriptCallStackFactory.cpp +++ b/WebCore/bindings/js/ScriptCallStackFactory.cpp @@ -48,7 +48,7 @@ using namespace JSC; namespace WebCore { -PassOwnPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize) +PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize) { Vector<ScriptCallFrame> frames; CallFrame* callFrame = exec; @@ -75,16 +75,16 @@ PassOwnPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t m break; callFrame = callFrame->callerFrame(); } - return new ScriptCallStack(frames); + return ScriptCallStack::create(frames); } -PassOwnPtr<ScriptArguments> createScriptArguments(JSC::ExecState* exec, unsigned skipArgumentCount) +PassRefPtr<ScriptArguments> createScriptArguments(JSC::ExecState* exec, unsigned skipArgumentCount) { Vector<ScriptValue> arguments; size_t argumentCount = exec->argumentCount(); for (size_t i = skipArgumentCount; i < argumentCount; ++i) arguments.append(ScriptValue(exec->argument(i))); - return new ScriptArguments(exec, arguments); + return ScriptArguments::create(exec, arguments); } bool ScriptCallStack::stackTrace(int, const RefPtr<InspectorArray>&) |