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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 (!isolate->InContext())
120 return nullptr;
121 if (InspectorInstrumentation::consoleAgentEnabled(currentExecutionContex t(isolate)))
119 stackSize = maxStackSize; 122 stackSize = maxStackSize;
120 } 123 }
121 return createScriptCallStack(stackSize); 124 return createScriptCallStack(stackSize);
122 } 125 }
123 126
124 PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState* scrip tState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArg umentCount) 127 PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState* scrip tState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArg umentCount)
125 { 128 {
126 Vector<ScriptValue> arguments; 129 Vector<ScriptValue> arguments;
127 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i) 130 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i)
128 arguments.append(ScriptValue(scriptState, v8arguments[i])); 131 arguments.append(ScriptValue(scriptState, v8arguments[i]));
129 132
130 return ScriptArguments::create(scriptState, arguments); 133 return ScriptArguments::create(scriptState, arguments);
131 } 134 }
132 135
133 } // namespace blink 136 } // namespace blink
OLDNEW
« 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