| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 Google Inc. All rights reserved. | 2 * Copyright (c) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 scriptCallFrames.append(toScriptCallFrame(stackFrame)); | 77 scriptCallFrames.append(toScriptCallFrame(stackFrame)); |
| 78 } | 78 } |
| 79 if (!frameCount && !emptyStackIsAllowed) { | 79 if (!frameCount && !emptyStackIsAllowed) { |
| 80 // Successfully grabbed stack trace, but there are no frames. It may hap
pen in case | 80 // Successfully grabbed stack trace, but there are no frames. It may hap
pen in case |
| 81 // when a bound function is called from native code for example. | 81 // when a bound function is called from native code for example. |
| 82 // Fallback to setting lineNumber to 0, and source and function name to
"undefined". | 82 // Fallback to setting lineNumber to 0, and source and function name to
"undefined". |
| 83 scriptCallFrames.append(ScriptCallFrame("undefined", "", "undefined", 0)
); | 83 scriptCallFrames.append(ScriptCallFrame("undefined", "", "undefined", 0)
); |
| 84 } | 84 } |
| 85 } | 85 } |
| 86 | 86 |
| 87 static PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTra
ce> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed, v8::Isolate* isol
ate) | 87 static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<
v8::StackTrace> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed, v8::I
solate* isolate) |
| 88 { | 88 { |
| 89 ASSERT(isolate->InContext()); | 89 ASSERT(isolate->InContext()); |
| 90 v8::HandleScope scope(isolate); | 90 v8::HandleScope scope(isolate); |
| 91 Vector<ScriptCallFrame> scriptCallFrames; | 91 Vector<ScriptCallFrame> scriptCallFrames; |
| 92 toScriptCallFramesVector(stackTrace, scriptCallFrames, maxStackSize, emptySt
ackIsAllowed, isolate); | 92 toScriptCallFramesVector(stackTrace, scriptCallFrames, maxStackSize, emptySt
ackIsAllowed, isolate); |
| 93 return ScriptCallStack::create(scriptCallFrames); | 93 return ScriptCallStack::create(scriptCallFrames); |
| 94 } | 94 } |
| 95 | 95 |
| 96 PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> sta
ckTrace, size_t maxStackSize, v8::Isolate* isolate) | 96 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::Sta
ckTrace> stackTrace, size_t maxStackSize, v8::Isolate* isolate) |
| 97 { | 97 { |
| 98 return createScriptCallStack(stackTrace, maxStackSize, true, isolate); | 98 return createScriptCallStack(stackTrace, maxStackSize, true, isolate); |
| 99 } | 99 } |
| 100 | 100 |
| 101 PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool empt
yStackIsAllowed) | 101 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSiz
e, bool emptyStackIsAllowed) |
| 102 { | 102 { |
| 103 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 103 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| 104 if (!isolate->InContext()) | 104 if (!isolate->InContext()) |
| 105 return nullptr; | 105 return nullptr; |
| 106 v8::HandleScope handleScope(isolate); | 106 v8::HandleScope handleScope(isolate); |
| 107 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isol
ate, maxStackSize, stackTraceOptions)); | 107 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isol
ate, maxStackSize, stackTraceOptions)); |
| 108 return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed,
isolate); | 108 return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed,
isolate); |
| 109 } | 109 } |
| 110 | 110 |
| 111 PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptState* scriptS
tate, size_t maxStackSize) | 111 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptSt
ate* scriptState, size_t maxStackSize) |
| 112 { | 112 { |
| 113 size_t stackSize = 1; | 113 size_t stackSize = 1; |
| 114 if (InspectorInstrumentation::hasFrontends()) { | 114 if (InspectorInstrumentation::hasFrontends()) { |
| 115 if (InspectorInstrumentation::consoleAgentEnabled(scriptState->execution
Context())) | 115 if (InspectorInstrumentation::consoleAgentEnabled(scriptState->execution
Context())) |
| 116 stackSize = maxStackSize; | 116 stackSize = maxStackSize; |
| 117 } | 117 } |
| 118 return createScriptCallStack(stackSize); | 118 return createScriptCallStack(stackSize); |
| 119 } | 119 } |
| 120 | 120 |
| 121 PassRefPtr<ScriptArguments> createScriptArguments(ScriptState* scriptState, cons
t v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount) | 121 PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState* scrip
tState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArg
umentCount) |
| 122 { | 122 { |
| 123 Vector<ScriptValue> arguments; | 123 Vector<ScriptValue> arguments; |
| 124 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i) | 124 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i) |
| 125 arguments.append(ScriptValue(scriptState, v8arguments[i])); | 125 arguments.append(ScriptValue(scriptState, v8arguments[i])); |
| 126 | 126 |
| 127 return ScriptArguments::create(scriptState, arguments); | 127 return ScriptArguments::create(scriptState, arguments); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace WebCore | 130 } // namespace WebCore |
| OLD | NEW |