| Index: third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp b/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp
|
| index bb2d5408b738335aa16c5b69d7bd5bf534c468ab..8fcae7103c08e67cc12f4872d90a421f643cc37d 100644
|
| --- a/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/v8/V8ProfilerAgentImpl.cpp
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "bindings/core/v8/ScriptCallStackFactory.h"
|
| #include "bindings/core/v8/V8Binding.h"
|
| -#include "core/inspector/InspectorState.h"
|
| #include "core/inspector/ScriptCallStack.h"
|
| #include "wtf/Atomics.h"
|
| #include <v8-profiler.h>
|
| @@ -199,7 +198,7 @@ void V8ProfilerAgentImpl::setSamplingInterval(ErrorString* error, int interval)
|
| *error = "Cannot change sampling interval when profiling.";
|
| return;
|
| }
|
| - m_state->setLong(ProfilerAgentState::samplingInterval, interval);
|
| + m_state->setNumber(ProfilerAgentState::samplingInterval, interval);
|
| m_isolate->GetCpuProfiler()->SetSamplingInterval(interval);
|
| }
|
|
|
| @@ -214,9 +213,13 @@ void V8ProfilerAgentImpl::clearFrontend()
|
| void V8ProfilerAgentImpl::restore()
|
| {
|
| m_enabled = true;
|
| - if (long interval = m_state->getLong(ProfilerAgentState::samplingInterval, 0))
|
| + long interval = 0;
|
| + m_state->getNumber(ProfilerAgentState::samplingInterval, &interval);
|
| + if (interval)
|
| m_isolate->GetCpuProfiler()->SetSamplingInterval(interval);
|
| - if (m_state->getBoolean(ProfilerAgentState::userInitiatedProfiling)) {
|
| + bool userInitiatedProfiling;
|
| + m_state->getBoolean(ProfilerAgentState::userInitiatedProfiling, &userInitiatedProfiling);
|
| + if (userInitiatedProfiling) {
|
| ErrorString error;
|
| start(&error);
|
| }
|
|
|