Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: Source/bindings/core/v8/ScriptCallStackFactory.cpp

Issue 458253002: [DevTools] Removed ScriptState from createScriptCallStackForConsole (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/bindings/core/v8/ScriptCallStackFactory.h ('k') | Source/core/frame/ConsoleBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/core/v8/ScriptCallStackFactory.cpp
diff --git a/Source/bindings/core/v8/ScriptCallStackFactory.cpp b/Source/bindings/core/v8/ScriptCallStackFactory.cpp
index 00aca0e79d76d11ff5d4ca33205ba22d56df8f27..0beead8512bf2f76654dd34cd2d680adc1b9eb44 100644
--- a/Source/bindings/core/v8/ScriptCallStackFactory.cpp
+++ b/Source/bindings/core/v8/ScriptCallStackFactory.cpp
@@ -111,11 +111,14 @@ PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSiz
return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed, isolate);
}
-PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptState* scriptState, size_t maxStackSize)
+PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t maxStackSize)
{
size_t stackSize = 1;
if (InspectorInstrumentation::hasFrontends()) {
- if (InspectorInstrumentation::consoleAgentEnabled(scriptState->executionContext()))
+ v8::Isolate* isolate = v8::Isolate::GetCurrent();
+ if (!isolate->InContext())
+ return nullptr;
+ if (InspectorInstrumentation::consoleAgentEnabled(currentExecutionContext(isolate)))
stackSize = maxStackSize;
}
return createScriptCallStack(stackSize);
« no previous file with comments | « Source/bindings/core/v8/ScriptCallStackFactory.h ('k') | Source/core/frame/ConsoleBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698