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

Unified Diff: Source/core/inspector/InspectorController.cpp

Issue 306053010: Tried using CrossThreadPersistent for workerDebuggerAgents (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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
« no previous file with comments | « Source/core/inspector/InspectorController.h ('k') | Source/core/inspector/InspectorDOMAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorController.cpp
diff --git a/Source/core/inspector/InspectorController.cpp b/Source/core/inspector/InspectorController.cpp
index 4fdf4d0d4c36d462c3b0a5dede06a16e24ca8139..efaf8ca1d2e60264e1d60a6e718e631a10c7ecbb 100644
--- a/Source/core/inspector/InspectorController.cpp
+++ b/Source/core/inspector/InspectorController.cpp
@@ -75,47 +75,47 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
, m_injectedScriptManager(InjectedScriptManager::createForPage())
, m_state(adoptPtr(new InspectorCompositeState(inspectorClient)))
, m_overlay(InspectorOverlay::create(page, inspectorClient))
- , m_layerTreeAgent(0)
+ , m_layerTreeAgent(nullptr)
, m_page(page)
, m_inspectorClient(inspectorClient)
- , m_agents(m_instrumentingAgents.get(), m_state.get())
+ , m_agents(adoptPtrWillBeNoop(new InspectorAgentRegistry(m_instrumentingAgents.get(), m_state.get())))
, m_isUnderTest(false)
, m_deferredAgentsInitialized(false)
{
InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
InspectorOverlay* overlay = m_overlay.get();
- m_agents.append(InspectorInspectorAgent::create(m_page, injectedScriptManager));
+ m_agents->append(InspectorInspectorAgent::create(m_page, injectedScriptManager));
- OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_page, injectedScriptManager, inspectorClient, overlay));
+ OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_page, injectedScriptManager, inspectorClient, overlay));
m_pageAgent = pageAgentPtr.get();
- m_agents.append(pageAgentPtr.release());
+ m_agents->append(pageAgentPtr.release());
- OwnPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_pageAgent, injectedScriptManager, overlay));
+ OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_pageAgent, injectedScriptManager, overlay));
m_domAgent = domAgentPtr.get();
- m_agents.append(domAgentPtr.release());
+ m_agents->append(domAgentPtr.release());
- OwnPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_page));
+ OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_page));
m_layerTreeAgent = layerTreeAgentPtr.get();
- m_agents.append(layerTreeAgentPtr.release());
+ m_agents->append(layerTreeAgentPtr.release());
- OwnPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(inspectorClient);
+ OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(inspectorClient);
m_tracingAgent = tracingAgentPtr.get();
- m_agents.append(tracingAgentPtr.release());
+ m_agents->append(tracingAgentPtr.release());
- OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_pageAgent, m_layerTreeAgent,
+ OwnPtrWillBeRawPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_pageAgent, m_layerTreeAgent,
overlay, InspectorTimelineAgent::PageInspector, inspectorClient));
m_timelineAgent = timelineAgentPtr.get();
- m_agents.append(timelineAgentPtr.release());
+ m_agents->append(timelineAgentPtr.release());
PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
- m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDebugServer, m_page, m_pageAgent));
+ m_agents->append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDebugServer, m_page, m_pageAgent));
- m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_timelineAgent));
+ m_agents->append(PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_timelineAgent));
- m_agents.append(InspectorWorkerAgent::create());
+ m_agents->append(InspectorWorkerAgent::create());
ASSERT_ARG(inspectorClient, inspectorClient);
m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), pageScriptDebugServer);
@@ -125,9 +125,21 @@ InspectorController::~InspectorController()
{
}
-PassOwnPtr<InspectorController> InspectorController::create(Page* page, InspectorClient* client)
+void InspectorController::trace(Visitor* visitor)
{
- return adoptPtr(new InspectorController(page, client));
+ visitor->trace(m_instrumentingAgents);
+ visitor->trace(m_domAgent);
+ visitor->trace(m_pageAgent);
+ visitor->trace(m_timelineAgent);
+ visitor->trace(m_layerTreeAgent);
+ visitor->trace(m_tracingAgent);
+ visitor->trace(m_agents);
+ visitor->trace(m_moduleAgents);
+}
+
+PassOwnPtrWillBeRawPtr<InspectorController> InspectorController::create(Page* page, InspectorClient* client)
+{
+ return adoptPtrWillBeNoop(new InspectorController(page, client));
}
void InspectorController::setTextAutosizingEnabled(bool enabled)
@@ -149,33 +161,33 @@ void InspectorController::initializeDeferredAgents()
InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
InspectorOverlay* overlay = m_overlay.get();
- OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_pageAgent));
+ OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_pageAgent));
InspectorResourceAgent* resourceAgent = resourceAgentPtr.get();
- m_agents.append(resourceAgentPtr.release());
+ m_agents->append(resourceAgentPtr.release());
- m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
+ m_agents->append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
- m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
+ m_agents->append(InspectorDOMStorageAgent::create(m_pageAgent));
- m_agents.append(InspectorMemoryAgent::create());
+ m_agents->append(InspectorMemoryAgent::create());
- m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
+ m_agents->append(InspectorApplicationCacheAgent::create(m_pageAgent));
PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
- OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pageScriptDebugServer, m_pageAgent, injectedScriptManager, overlay));
+ OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pageScriptDebugServer, m_pageAgent, injectedScriptManager, overlay));
InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
- m_agents.append(debuggerAgentPtr.release());
+ m_agents->append(debuggerAgentPtr.release());
- m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
+ m_agents->append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
- m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, overlay));
+ m_agents->append(InspectorProfilerAgent::create(injectedScriptManager, overlay));
- m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager));
+ m_agents->append(InspectorHeapProfilerAgent::create(injectedScriptManager));
- m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptManager));
+ m_agents->append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptManager));
- m_agents.append(InspectorInputAgent::create(m_page, m_inspectorClient));
+ m_agents->append(InspectorInputAgent::create(m_page, m_inspectorClient));
}
void InspectorController::willBeDestroyed()
@@ -185,13 +197,13 @@ void InspectorController::willBeDestroyed()
m_inspectorClient = 0;
m_page = 0;
m_instrumentingAgents->reset();
- m_agents.discardAgents();
+ m_agents->discardAgents();
}
-void InspectorController::registerModuleAgent(PassOwnPtr<InspectorAgent> agent)
+void InspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
{
m_moduleAgents.append(agent.get());
- m_agents.append(agent);
+ m_agents->append(agent);
}
void InspectorController::setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient> inspectorFrontendClient)
@@ -217,7 +229,7 @@ void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChan
// We can reconnect to existing front-end -> unmute state.
m_state->unmute();
- m_agents.setFrontend(m_inspectorFrontend.get());
+ m_agents->setFrontend(m_inspectorFrontend.get());
InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
InspectorInstrumentation::frontendCreated();
@@ -225,7 +237,7 @@ void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChan
ASSERT(m_inspectorClient);
m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(frontendChannel);
- m_agents.registerInDispatcher(m_inspectorBackendDispatcher.get());
+ m_agents->registerInDispatcher(m_inspectorBackendDispatcher.get());
}
void InspectorController::disconnectFrontend()
@@ -239,7 +251,7 @@ void InspectorController::disconnectFrontend()
// Pre-disconnect state will be used to restore inspector agents.
m_state->mute();
- m_agents.clearFrontend();
+ m_agents->clearFrontend();
m_inspectorFrontend.clear();
@@ -263,7 +275,7 @@ void InspectorController::reuseFrontend(InspectorFrontendChannel* frontendChanne
ASSERT(!m_inspectorFrontend);
connectFrontend(frontendChannel);
m_state->loadFromCookie(inspectorStateCookie);
- m_agents.restore();
+ m_agents->restore();
}
void InspectorController::setProcessId(long processId)
@@ -414,12 +426,12 @@ void InspectorController::didProcessTask()
void InspectorController::flushPendingFrontendMessages()
{
- m_agents.flushPendingFrontendMessages();
+ m_agents->flushPendingFrontendMessages();
}
void InspectorController::didCommitLoadForMainFrame()
{
- Vector<InspectorAgent*> agents = m_moduleAgents;
+ WillBeHeapVector<RawPtrWillBeMember<InspectorAgent> > agents = m_moduleAgents;
for (size_t i = 0; i < agents.size(); i++)
agents[i]->didCommitLoadForMainFrame();
}
« no previous file with comments | « Source/core/inspector/InspectorController.h ('k') | Source/core/inspector/InspectorDOMAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698