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

Side by Side Diff: Source/bindings/core/v8/ScriptCallStackFactory.cpp

Issue 717703002: Move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/We… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
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()); 83 scriptCallFrames.append(ScriptCallFrame());
84 } 84 }
85 } 85 }
86 86
87 static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle< v8::StackTrace> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed, v8::I solate* isolate) 87 static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Isolate * isolate, v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, bool empt yStackIsAllowed)
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 RefPtrWillBeRawPtr<ScriptCallStack> callStack = ScriptCallStack::create(scri ptCallFrames); 93 RefPtrWillBeRawPtr<ScriptCallStack> callStack = ScriptCallStack::create(scri ptCallFrames);
94 if (InspectorInstrumentation::hasFrontends() && maxStackSize > 1) 94 if (InspectorInstrumentation::hasFrontends() && maxStackSize > 1)
95 InspectorInstrumentation::appendAsyncCallStack(currentExecutionContext(i solate), callStack.get()); 95 InspectorInstrumentation::appendAsyncCallStack(currentExecutionContext(i solate), callStack.get());
96 return callStack.release(); 96 return callStack.release();
97 } 97 }
98 98
99 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::Sta ckTrace> stackTrace, size_t maxStackSize, v8::Isolate* isolate) 99 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Isolate* isola te, v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize)
100 { 100 {
101 return createScriptCallStack(stackTrace, maxStackSize, true, isolate); 101 return createScriptCallStack(isolate, stackTrace, maxStackSize, true);
102 } 102 }
103 103
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(isolate, stackTrace, maxStackSize, emptyStackIs Allowed);
112 } 112 }
113 113
114 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t m axStackSize, bool emptyStackIsAllowed) 114 PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t m axStackSize, bool emptyStackIsAllowed)
115 { 115 {
116 size_t stackSize = 1; 116 size_t stackSize = 1;
117 if (InspectorInstrumentation::hasFrontends()) { 117 if (InspectorInstrumentation::hasFrontends()) {
118 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 118 v8::Isolate* isolate = v8::Isolate::GetCurrent();
119 if (!isolate->InContext()) 119 if (!isolate->InContext())
120 return nullptr; 120 return nullptr;
121 if (InspectorInstrumentation::consoleAgentEnabled(currentExecutionContex t(isolate))) 121 if (InspectorInstrumentation::consoleAgentEnabled(currentExecutionContex t(isolate)))
122 stackSize = maxStackSize; 122 stackSize = maxStackSize;
123 } 123 }
124 return createScriptCallStack(stackSize, emptyStackIsAllowed); 124 return createScriptCallStack(stackSize, emptyStackIsAllowed);
125 } 125 }
126 126
127 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)
128 { 128 {
129 Vector<ScriptValue> arguments; 129 Vector<ScriptValue> arguments;
130 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i) 130 for (int i = skipArgumentCount; i < v8arguments.Length(); ++i)
131 arguments.append(ScriptValue(scriptState, v8arguments[i])); 131 arguments.append(ScriptValue(scriptState, v8arguments[i]));
132 132
133 return ScriptArguments::create(scriptState, arguments); 133 return ScriptArguments::create(scriptState, arguments);
134 } 134 }
135 135
136 } // namespace blink 136 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptCallStackFactory.h ('k') | Source/bindings/core/v8/ScriptDebugServer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698