Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 57 matching lines @@
 #include "core/rendering/RenderLayer.h"
 #include "platform/PlatformMouseEvent.h"
 
 namespace WebCore {
 
 InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient)
     : m_instrumentingAgents(InstrumentingAgents::create())
     , 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_isUnderTest(false)
     , m_deferredAgentsInitialized(false)
 {
     InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
     InspectorOverlay* overlay = m_overlay.get();
 
-    m_agents.append(InspectorInspectorAgent::create(m_page, injectedScriptManager));
+    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());
+    agents().append(pageAgentPtr.release());

[yurys, 2014/06/18 14:23:37]

What's the point in having agents() compared to using m_agents-> directly?

[keishi, 2014/06/18 14:47:09]

I'm not sure. tkent@ could you explain?
https://codereview.chromium.org/307943002/#msg21

[tkent, 2014/06/18 23:21:29]

m_agents is always non-null, and we prefer using references for non-null objects
like the original code.

 
-    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());
+    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());
+    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());
+    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());
+    agents().append(timelineAgentPtr.release());
 
     PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
 
-    m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDebugServer, m_page, m_pageAgent));
+    agents().append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDebugServer, m_page, m_pageAgent));
 
-    m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_timelineAgent));
+    agents().append(PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_timelineAgent));
 
-    m_agents.append(InspectorWorkerAgent::create());
+    agents().append(InspectorWorkerAgent::create());
 
     ASSERT_ARG(inspectorClient, inspectorClient);
     m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), pageScriptDebugServer);
 }
 
 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_page);
+    m_agents.trace(visitor);
+#if ENABLE(OILPAN)
+    visitor->trace(m_moduleAgents);
+#endif
+}
+
+PassOwnPtrWillBeRawPtr<InspectorController> InspectorController::create(Page* page, InspectorClient* client)
+{
+    return adoptPtrWillBeNoop(new InspectorController(page, client));
 }
 
 void InspectorController::setTextAutosizingEnabled(bool enabled)
 {
     m_pageAgent->setTextAutosizingEnabled(enabled);
 }
 
 void InspectorController::setDeviceScaleAdjustment(float deviceScaleAdjustment)
 {
     m_pageAgent->setDeviceScaleAdjustment(deviceScaleAdjustment);
 }
 
 void InspectorController::initializeDeferredAgents()
 {
     if (m_deferredAgentsInitialized)
         return;
     m_deferredAgentsInitialized = true;
 
     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());
+    agents().append(resourceAgentPtr.release());
 
-    m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
+    agents().append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
 
-    m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
+    agents().append(InspectorDOMStorageAgent::create(m_pageAgent));
 
-    m_agents.append(InspectorMemoryAgent::create());
+    agents().append(InspectorMemoryAgent::create());
 
-    m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
+    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());
+    agents().append(debuggerAgentPtr.release());
 
-    m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
+    agents().append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent));
 
-    m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, overlay));
+    agents().append(InspectorProfilerAgent::create(injectedScriptManager, overlay));
 
-    m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager));
+    agents().append(InspectorHeapProfilerAgent::create(injectedScriptManager));
 
-    m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptManager));
+    agents().append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptManager));
 
-    m_agents.append(InspectorInputAgent::create(m_page, m_inspectorClient));
+    agents().append(InspectorInputAgent::create(m_page, m_inspectorClient));
 }
 
 void InspectorController::willBeDestroyed()
 {
     disconnectFrontend();
     m_injectedScriptManager->disconnect();
     m_inspectorClient = 0;
-    m_page = 0;
+    m_page = nullptr;
     m_instrumentingAgents->reset();
-    m_agents.discardAgents();
+    agents().discardAgents();
 }
 
-void InspectorController::registerModuleAgent(PassOwnPtr<InspectorAgent> agent)
+void InspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
 {
     m_moduleAgents.append(agent.get());
-    m_agents.append(agent);
+    agents().append(agent);
 }
 
 void InspectorController::setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient> inspectorFrontendClient)
 {
     m_inspectorFrontendClient = inspectorFrontendClient;
 }
 
 void InspectorController::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     // If the page is supposed to serve as InspectorFrontend notify inspector frontend
     // client that it's cleared so that the client can expose inspector bindings.
     if (m_inspectorFrontendClient && frame == m_page->mainFrame())
         m_inspectorFrontendClient->windowObjectCleared();
 }
 
 void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChannel)
 {
     ASSERT(frontendChannel);
 
     initializeDeferredAgents();
 
     m_inspectorFrontend = adoptPtr(new InspectorFrontend(frontendChannel));
     // We can reconnect to existing front-end -> unmute state.
     m_state->unmute();
 
-    m_agents.setFrontend(m_inspectorFrontend.get());
+    agents().setFrontend(m_inspectorFrontend.get());
 
     InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
     InspectorInstrumentation::frontendCreated();
 
     ASSERT(m_inspectorClient);
     m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(frontendChannel);
 
-    m_agents.registerInDispatcher(m_inspectorBackendDispatcher.get());
+    agents().registerInDispatcher(m_inspectorBackendDispatcher.get());
 }
 
 void InspectorController::disconnectFrontend()
 {
     if (!m_inspectorFrontend)
         return;
     m_inspectorBackendDispatcher->clearFrontend();
     m_inspectorBackendDispatcher.clear();
 
     // Destroying agents would change the state, but we don't want that.
     // Pre-disconnect state will be used to restore inspector agents.
     m_state->mute();
 
-    m_agents.clearFrontend();
+    agents().clearFrontend();
 
     m_inspectorFrontend.clear();
 
     // relese overlay page resources
     m_overlay->freePage();
     InspectorInstrumentation::frontendDeleted();
     InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
 }
 
 void InspectorController::reconnectFrontend()
 {
     if (!m_inspectorFrontend)
         return;
     InspectorFrontendChannel* frontendChannel = m_inspectorFrontend->channel();
     disconnectFrontend();
     connectFrontend(frontendChannel);
 }
 
 void InspectorController::reuseFrontend(InspectorFrontendChannel* frontendChannel, const String& inspectorStateCookie)
 {
     ASSERT(!m_inspectorFrontend);
     connectFrontend(frontendChannel);
     m_state->loadFromCookie(inspectorStateCookie);
-    m_agents.restore();
+    agents().restore();
 }
 
 void InspectorController::setProcessId(long processId)
 {
     IdentifiersFactory::setProcessId(processId);
 }
 
 void InspectorController::setLayerTreeId(int id)
 {
     m_timelineAgent->setLayerTreeId(id);
@@ skipping 130 matching lines @@
     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
         timelineAgent->didProcessTask();
     if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspectorProfilerAgent())
         profilerAgent->didProcessTask();
     if (InspectorDOMDebuggerAgent* domDebuggerAgent = m_instrumentingAgents->inspectorDOMDebuggerAgent())
         domDebuggerAgent->didProcessTask();
 }
 
 void InspectorController::flushPendingFrontendMessages()
 {
-    m_agents.flushPendingFrontendMessages();
+    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();
 }
 
 void InspectorController::didBeginFrame(int frameId)
 {
     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
         timelineAgent->didBeginFrame(frameId);
     if (InspectorCanvasAgent* canvasAgent = m_instrumentingAgents->inspectorCanvasAgent())
         canvasAgent->didBeginFrame();
@@ skipping 35 matching lines @@
         m_layerTreeAgent->willAddPageOverlay(layer);
 }
 
 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer)
 {
     if (m_layerTreeAgent)
         m_layerTreeAgent->didRemovePageOverlay(layer);
 }
 
 } // namespace WebCore