Commit f94632ff authored by jochen's avatar jochen Committed by Commit bot

Stop using Isolate::GetCurrent() in inspector/v8

R=pfeldman@chromium.org
BUG=580337

Review URL: https://codereview.chromium.org/1637413003

Cr-Commit-Position: refs/heads/master@{#371813}
parent b89916f1
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
namespace blink { namespace blink {
JavaScriptCallFrame::JavaScriptCallFrame(v8::Local<v8::Context> debuggerContext, v8::Local<v8::Object> callFrame) JavaScriptCallFrame::JavaScriptCallFrame(v8::Local<v8::Context> debuggerContext, v8::Local<v8::Object> callFrame)
: m_isolate(v8::Isolate::GetCurrent()) : m_isolate(debuggerContext->GetIsolate())
, m_debuggerContext(m_isolate, debuggerContext) , m_debuggerContext(m_isolate, debuggerContext)
, m_callFrame(m_isolate, callFrame) , m_callFrame(m_isolate, callFrame)
{ {
......
...@@ -39,15 +39,15 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::Profiler::PositionTickInfo>> buildIns ...@@ -39,15 +39,15 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::Profiler::PositionTickInfo>> buildIns
return array.release(); return array.release();
} }
PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectFor(const v8::CpuProfileNode* node) PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectFor(v8::Isolate* isolate, const v8::CpuProfileNode* node)
{ {
v8::HandleScope handleScope(v8::Isolate::GetCurrent()); v8::HandleScope handleScope(isolate);
RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create(); RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
const int childrenCount = node->GetChildrenCount(); const int childrenCount = node->GetChildrenCount();
for (int i = 0; i < childrenCount; i++) { for (int i = 0; i < childrenCount; i++) {
const v8::CpuProfileNode* child = node->GetChild(i); const v8::CpuProfileNode* child = node->GetChild(i);
children->addItem(buildInspectorObjectFor(child)); children->addItem(buildInspectorObjectFor(isolate, child));
} }
RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::PositionTickInfo>> positionTicks = buildInspectorObjectForPositionTicks(node); RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::PositionTickInfo>> positionTicks = buildInspectorObjectForPositionTicks(node);
...@@ -85,10 +85,10 @@ PassRefPtr<TypeBuilder::Array<double>> buildInspectorObjectForTimestamps(v8::Cpu ...@@ -85,10 +85,10 @@ PassRefPtr<TypeBuilder::Array<double>> buildInspectorObjectForTimestamps(v8::Cpu
return array.release(); return array.release();
} }
PassRefPtr<TypeBuilder::Profiler::CPUProfile> createCPUProfile(v8::CpuProfile* v8profile) PassRefPtr<TypeBuilder::Profiler::CPUProfile> createCPUProfile(v8::Isolate* isolate, v8::CpuProfile* v8profile)
{ {
RefPtr<TypeBuilder::Profiler::CPUProfile> profile = TypeBuilder::Profiler::CPUProfile::create() RefPtr<TypeBuilder::Profiler::CPUProfile> profile = TypeBuilder::Profiler::CPUProfile::create()
.setHead(buildInspectorObjectFor(v8profile->GetTopDownRoot())) .setHead(buildInspectorObjectFor(isolate, v8profile->GetTopDownRoot()))
.setStartTime(static_cast<double>(v8profile->GetStartTime()) / 1000000) .setStartTime(static_cast<double>(v8profile->GetStartTime()) / 1000000)
.setEndTime(static_cast<double>(v8profile->GetEndTime()) / 1000000); .setEndTime(static_cast<double>(v8profile->GetEndTime()) / 1000000);
profile->setSamples(buildInspectorObjectForSamples(v8profile)); profile->setSamples(buildInspectorObjectForSamples(v8profile));
...@@ -279,7 +279,7 @@ PassRefPtr<TypeBuilder::Profiler::CPUProfile> V8ProfilerAgentImpl::stopProfiling ...@@ -279,7 +279,7 @@ PassRefPtr<TypeBuilder::Profiler::CPUProfile> V8ProfilerAgentImpl::stopProfiling
return nullptr; return nullptr;
RefPtr<TypeBuilder::Profiler::CPUProfile> result; RefPtr<TypeBuilder::Profiler::CPUProfile> result;
if (serialize) if (serialize)
result = createCPUProfile(profile); result = createCPUProfile(m_isolate, profile);
profile->Delete(); profile->Delete();
return result.release(); return result.release();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment