| Index: third_party/WebKit/Source/platform/v8_inspector/V8HeapProfilerAgentImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8HeapProfilerAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8HeapProfilerAgentImpl.cpp
|
| index 5776303da55f185ebf3da3aec206f98a12d85ff3..9fdf3898de8e8ee15336910524a6a2ec719f488e 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8HeapProfilerAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8HeapProfilerAgentImpl.cpp
|
| @@ -5,10 +5,10 @@
|
| #include "platform/v8_inspector/V8HeapProfilerAgentImpl.h"
|
|
|
| #include "platform/v8_inspector/InjectedScript.h"
|
| -#include "platform/v8_inspector/V8DebuggerImpl.h"
|
| +#include "platform/v8_inspector/V8InspectorImpl.h"
|
| #include "platform/v8_inspector/V8InspectorSessionImpl.h"
|
| #include "platform/v8_inspector/V8StringUtil.h"
|
| -#include "platform/v8_inspector/public/V8DebuggerClient.h"
|
| +#include "platform/v8_inspector/public/V8InspectorClient.h"
|
| #include <v8-profiler.h>
|
| #include <v8-version.h>
|
|
|
| @@ -50,7 +50,7 @@ public:
|
|
|
| const char* GetName(v8::Local<v8::Object> object) override
|
| {
|
| - int contextId = V8DebuggerImpl::contextId(object->CreationContext());
|
| + int contextId = V8InspectorImpl::contextId(object->CreationContext());
|
| if (!contextId)
|
| return "";
|
| ErrorString errorString;
|
| @@ -149,7 +149,7 @@ private:
|
|
|
| V8HeapProfilerAgentImpl::V8HeapProfilerAgentImpl(V8InspectorSessionImpl* session, protocol::FrontendChannel* frontendChannel, protocol::DictionaryValue* state)
|
| : m_session(session)
|
| - , m_isolate(session->debugger()->isolate())
|
| + , m_isolate(session->inspector()->isolate())
|
| , m_frontend(frontendChannel)
|
| , m_state(state)
|
| , m_hasTimer(false)
|
| @@ -253,7 +253,7 @@ void V8HeapProfilerAgentImpl::getObjectByHeapObjectId(ErrorString* error, const
|
| return;
|
| }
|
|
|
| - if (!m_session->debugger()->client()->isInspectableHeapObject(heapObject)) {
|
| + if (!m_session->inspector()->client()->isInspectableHeapObject(heapObject)) {
|
| *error = "Object is not available";
|
| return;
|
| }
|
| @@ -279,7 +279,7 @@ void V8HeapProfilerAgentImpl::addInspectedHeapObject(ErrorString* errorString, c
|
| return;
|
| }
|
|
|
| - if (!m_session->debugger()->client()->isInspectableHeapObject(heapObject)) {
|
| + if (!m_session->inspector()->client()->isInspectableHeapObject(heapObject)) {
|
| *errorString = "Object is not available";
|
| return;
|
| }
|
| @@ -304,7 +304,7 @@ void V8HeapProfilerAgentImpl::requestHeapStatsUpdate()
|
| {
|
| HeapStatsStream stream(&m_frontend);
|
| v8::SnapshotObjectId lastSeenObjectId = m_isolate->GetHeapProfiler()->GetHeapStats(&stream);
|
| - m_frontend.lastSeenObjectId(lastSeenObjectId, m_session->debugger()->client()->currentTimeMS());
|
| + m_frontend.lastSeenObjectId(lastSeenObjectId, m_session->inspector()->client()->currentTimeMS());
|
| }
|
|
|
| // static
|
| @@ -318,14 +318,14 @@ void V8HeapProfilerAgentImpl::startTrackingHeapObjectsInternal(bool trackAllocat
|
| m_isolate->GetHeapProfiler()->StartTrackingHeapObjects(trackAllocations);
|
| if (!m_hasTimer) {
|
| m_hasTimer = true;
|
| - m_session->debugger()->client()->startRepeatingTimer(0.05, &V8HeapProfilerAgentImpl::onTimer, reinterpret_cast<void*>(this));
|
| + m_session->inspector()->client()->startRepeatingTimer(0.05, &V8HeapProfilerAgentImpl::onTimer, reinterpret_cast<void*>(this));
|
| }
|
| }
|
|
|
| void V8HeapProfilerAgentImpl::stopTrackingHeapObjectsInternal()
|
| {
|
| if (m_hasTimer) {
|
| - m_session->debugger()->client()->cancelTimer(reinterpret_cast<void*>(this));
|
| + m_session->inspector()->client()->cancelTimer(reinterpret_cast<void*>(this));
|
| m_hasTimer = false;
|
| }
|
| m_isolate->GetHeapProfiler()->StopTrackingHeapObjects();
|
|
|