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

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

Issue 2012753003: DevTools: consolidate protocol generators for front-end, backend and type builder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
Index: third_party/WebKit/Source/core/inspector/InspectorSession.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorSession.cpp b/third_party/WebKit/Source/core/inspector/InspectorSession.cpp
index e83df2445719b5715b8b296be685762b6f2f983d..95927f77dab862693a96746135fad9e2ba155b88 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorSession.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorSession.cpp
@@ -10,7 +10,6 @@
#include "core/inspector/InspectedFrames.h"
#include "core/inspector/InspectorBaseAgent.h"
#include "core/inspector/InspectorInstrumentation.h"
-#include "platform/inspector_protocol/Backend.h"
#include "platform/inspector_protocol/Parser.h"
#include "platform/inspector_protocol/TypeBuilder.h"
#include "platform/v8_inspector/public/V8Debugger.h"
@@ -30,8 +29,7 @@ InspectorSession::InspectorSession(Client* client, InspectedFrames* inspectedFra
, m_disposed(false)
, m_inspectedFrames(inspectedFrames)
, m_instrumentingAgents(instrumentingAgents)
- , m_inspectorFrontend(new protocol::Frontend(this))
- , m_inspectorBackendDispatcher(protocol::Dispatcher::create(this))
+ , m_inspectorBackendDispatcher(new protocol::UberDispatcher(this))
{
InspectorInstrumentation::frontendCreated();
@@ -58,7 +56,7 @@ InspectorSession::~InspectorSession()
void InspectorSession::append(InspectorAgent* agent)
{
m_agents.append(agent);
- agent->init(m_instrumentingAgents.get(), m_inspectorFrontend.get(), m_inspectorBackendDispatcher.get(), m_state.get());
+ agent->init(m_instrumentingAgents.get(), m_inspectorBackendDispatcher.get(), m_state.get());
}
void InspectorSession::restore()
@@ -72,11 +70,9 @@ void InspectorSession::dispose()
{
DCHECK(!m_disposed);
m_disposed = true;
- m_inspectorBackendDispatcher->clearFrontend();
m_inspectorBackendDispatcher.reset();
for (size_t i = m_agents.size(); i > 0; i--)
m_agents[i - 1]->dispose();
- m_inspectorFrontend.reset();
m_agents.clear();
m_v8Session.reset();
DCHECK(!isInstrumenting());

Powered by Google App Engine
This is Rietveld 408576698