third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp - Issue 1924663006: [DevTools] Move API methods from V8RuntimeAgent to V8InspectorSession.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp

Issue 1924663006: [DevTools] Move API methods from V8RuntimeAgent to V8InspectorSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@debugger-into-session

Patch Set: rebased Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.h ('k') | third_party/WebKit/Source/core/inspector/PageConsoleAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp

index ad1777d3d5cf6e6db86742490fc7bb571767eced..743c452559ad8112d1288fccab97a26c37f742b3 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp

@@ -41,7 +41,6 @@

#include "platform/inspector_protocol/Values.h"

#include "platform/v8_inspector/public/V8EventListenerInfo.h"

#include "platform/v8_inspector/public/V8InspectorSession.h"

-#include "platform/v8_inspector/public/V8RuntimeAgent.h"

namespace {

@@ -112,11 +111,10 @@ void InspectorDOMDebuggerAgent::eventListenersInfoForTarget(v8::Isolate* isolate

}

-InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(v8::Isolate* isolate, InspectorDOMAgent* domAgent, V8RuntimeAgent* runtimeAgent, V8InspectorSession* v8Session)

+InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(v8::Isolate* isolate, InspectorDOMAgent* domAgent, V8InspectorSession* v8Session)

: InspectorBaseAgent<InspectorDOMDebuggerAgent, protocol::Frontend::DOMDebugger>("DOMDebugger")

, m_isolate(isolate)

, m_domAgent(domAgent)

- , m_runtimeAgent(runtimeAgent)

, m_v8Session(v8Session)

{

}

@@ -339,7 +337,7 @@ void InspectorDOMDebuggerAgent::getEventListeners(ErrorString* errorString, cons

v8::Local<v8::Context> context;

String16 objectGroup;

- v8::Local<v8::Value> value = m_runtimeAgent->findObject(errorString, objectId, &context, &objectGroup);

+ v8::Local<v8::Value> value = m_v8Session->findObject(errorString, objectId, &context, &objectGroup);

if (value.IsEmpty())

return;

v8::Context::Scope scope(context);

@@ -392,8 +390,8 @@ PassOwnPtr<protocol::DOMDebugger::EventListener> InspectorDOMDebuggerAgent::buil

.setPassive(info.passive)

.setLocation(location.release()).build();

if (!objectGroupId.isEmpty()) {

- value->setHandler(m_runtimeAgent->wrapObject(context, function, objectGroupId));

- value->setOriginalHandler(m_runtimeAgent->wrapObject(context, info.handler, objectGroupId));

+ value->setHandler(m_v8Session->wrapObject(context, function, objectGroupId));

+ value->setOriginalHandler(m_v8Session->wrapObject(context, info.handler, objectGroupId));

}

return value.release();

}