Chromium Code Reviews| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSiz e, bool emptyStackIsAllowed) | 104 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSiz e, bool emptyStackIsAllowed) |
| 105 { | 105 { |
| 106 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 106 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| 107 if (!isolate->InContext()) | 107 if (!isolate->InContext()) |
| 108 return nullptr; | 108 return nullptr; |
| 109 v8::HandleScope handleScope(isolate); | 109 v8::HandleScope handleScope(isolate); |
| 110 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isol ate, maxStackSize, stackTraceOptions)); | 110 v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isol ate, maxStackSize, stackTraceOptions)); |
| 111 return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed, isolate); | 111 return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed, isolate); |
| 112 } | 112 } |
| 113 | 113 |
| 114 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptSt ate* scriptState, size_t maxStackSize) | 114 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t m axStackSize) |
| 115 { | 115 { |
| 116 size_t stackSize = 1; | 116 size_t stackSize = 1; |
| 117 if (InspectorInstrumentation::hasFrontends()) { | 117 if (InspectorInstrumentation::hasFrontends()) { |
| 118 if (InspectorInstrumentation::consoleAgentEnabled(scriptState->execution Context())) | 118 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| 119 if (InspectorInstrumentation::consoleAgentEnabled(currentExecutionContex t(isolate))) | |
|
vsevik
2014/08/11 15:52:03
These lines might be needed here, please check wit
kozyatinskiy1
2014/08/11 16:05:34
First check added. @yurus, could you please answer
aandrey
2014/08/11 17:38:03
1) Calling currentExecutionContext() when not in c
kozyatinskiy1
2014/08/11 17:50:42
Thank you. Furthermore, this test may be useful he
| |
| 119 stackSize = maxStackSize; | 120 stackSize = maxStackSize; |
| 120 } | 121 } |
| 121 return createScriptCallStack(stackSize); | 122 return createScriptCallStack(stackSize); |
| 122 } | 123 } |
| 123 | 124 |
| 124 PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState* scrip tState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArg umentCount) | 125 PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState* scrip tState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArg umentCount) |
| 125 { | 126 { |
| 126 Vector<ScriptValue> arguments; | 127 Vector<ScriptValue> arguments; |
| 127 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i) | 128 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i) |
| 128 arguments.append(ScriptValue(scriptState, v8arguments[i])); | 129 arguments.append(ScriptValue(scriptState, v8arguments[i])); |
| 129 | 130 |
| 130 return ScriptArguments::create(scriptState, arguments); | 131 return ScriptArguments::create(scriptState, arguments); |
| 131 } | 132 } |
| 132 | 133 |
| 133 } // namespace blink | 134 } // namespace blink |
| OLD | NEW |