Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/InspectorTimelineAgent.cpp

 /*
 * Copyright (C) 2013 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 243 matching lines @@
     addRecordToTimeline(record.release(), time);
     if (m_state->getBoolean(TimelineAgentState::includeCounters)) {
         addRecordToTimeline(createCountersUpdate(), time);
     }
 }
 
 InspectorTimelineAgent::~InspectorTimelineAgent()
 {
 }
 
+void InspectorTimelineAgent::trace(Visitor* visitor)
+{
+    visitor->trace(m_pageAgent);
+    visitor->trace(m_layerTreeAgent);
+    InspectorBaseAgent::trace(visitor);
+}
+
 void InspectorTimelineAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->timeline();
 }
 
 void InspectorTimelineAgent::clearFrontend()
 {
     ErrorString error;
     RefPtr<TypeBuilder::Array<TimelineEvent> > events;
     stop(&error, events);
@@ skipping 70 matching lines @@
 
 void InspectorTimelineAgent::innerStart()
 {
     if (m_overlay)
         m_overlay->startedRecordingProfile();
     m_state->setBoolean(TimelineAgentState::started, true);
     m_instrumentingAgents->setInspectorTimelineAgent(this);
     ScriptGCEvent::addEventListener(this);
     if (m_client) {
         TraceEventDispatcher* dispatcher = TraceEventDispatcher::instance();
-        dispatcher->addListener(InstrumentationEvents::BeginFrame, TRACE_EVENT_PHASE_INSTANT, this, &InspectorTimelineAgent::onBeginImplSideFrame, m_client);
-        dispatcher->addListener(InstrumentationEvents::PaintSetup, TRACE_EVENT_PHASE_BEGIN, this, &InspectorTimelineAgent::onPaintSetupBegin, m_client);
-        dispatcher->addListener(InstrumentationEvents::PaintSetup, TRACE_EVENT_PHASE_END, this, &InspectorTimelineAgent::onPaintSetupEnd, m_client);
-        dispatcher->addListener(InstrumentationEvents::RasterTask, TRACE_EVENT_PHASE_BEGIN, this, &InspectorTimelineAgent::onRasterTaskBegin, m_client);
-        dispatcher->addListener(InstrumentationEvents::RasterTask, TRACE_EVENT_PHASE_END, this, &InspectorTimelineAgent::onRasterTaskEnd, m_client);
-        dispatcher->addListener(InstrumentationEvents::Layer, TRACE_EVENT_PHASE_DELETE_OBJECT, this, &InspectorTimelineAgent::onLayerDeleted, m_client);
-        dispatcher->addListener(InstrumentationEvents::RequestMainThreadFrame, TRACE_EVENT_PHASE_INSTANT, this, &InspectorTimelineAgent::onRequestMainThreadFrame, m_client);
-        dispatcher->addListener(InstrumentationEvents::ActivateLayerTree, TRACE_EVENT_PHASE_INSTANT, this, &InspectorTimelineAgent::onActivateLayerTree, m_client);
-        dispatcher->addListener(InstrumentationEvents::DrawFrame, TRACE_EVENT_PHASE_INSTANT, this, &InspectorTimelineAgent::onDrawFrame, m_client);
-        dispatcher->addListener(PlatformInstrumentation::ImageDecodeEvent, TRACE_EVENT_PHASE_BEGIN, this, &InspectorTimelineAgent::onImageDecodeBegin, m_client);
-        dispatcher->addListener(PlatformInstrumentation::ImageDecodeEvent, TRACE_EVENT_PHASE_END, this, &InspectorTimelineAgent::onImageDecodeEnd, m_client);
-        dispatcher->addListener(PlatformInstrumentation::DrawLazyPixelRefEvent, TRACE_EVENT_PHASE_INSTANT, this, &InspectorTimelineAgent::onDrawLazyPixelRef, m_client);
-        dispatcher->addListener(PlatformInstrumentation::DecodeLazyPixelRefEvent, TRACE_EVENT_PHASE_BEGIN, this, &InspectorTimelineAgent::onDecodeLazyPixelRefBegin, m_client);
-        dispatcher->addListener(PlatformInstrumentation::DecodeLazyPixelRefEvent, TRACE_EVENT_PHASE_END, this, &InspectorTimelineAgent::onDecodeLazyPixelRefEnd, m_client);
-        dispatcher->addListener(PlatformInstrumentation::LazyPixelRef, TRACE_EVENT_PHASE_DELETE_OBJECT, this, &InspectorTimelineAgent::onLazyPixelRefDeleted, m_client);
-        dispatcher->addListener(InstrumentationEvents::EmbedderCallback, TRACE_EVENT_PHASE_BEGIN, this, &InspectorTimelineAgent::onEmbedderCallbackBegin, m_client);
-        dispatcher->addListener(InstrumentationEvents::EmbedderCallback, TRACE_EVENT_PHASE_END, this, &InspectorTimelineAgent::onEmbedderCallbackEnd, m_client);
+        dispatcher->addListener(InstrumentationEvents::BeginFrame, TRACE_EVENT_PHASE_INSTANT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onBeginImplSideFrame)), m_client);

[haraken, 2014/07/14 12:33:39]

Shall we add a create() method?

[keishi, 2014/07/15 05:52:52]

Done.

+        dispatcher->addListener(InstrumentationEvents::PaintSetup, TRACE_EVENT_PHASE_BEGIN, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onPaintSetupBegin)), m_client);
+        dispatcher->addListener(InstrumentationEvents::PaintSetup, TRACE_EVENT_PHASE_END, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onPaintSetupEnd)), m_client);
+        dispatcher->addListener(InstrumentationEvents::RasterTask, TRACE_EVENT_PHASE_BEGIN, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onRasterTaskBegin)), m_client);
+        dispatcher->addListener(InstrumentationEvents::RasterTask, TRACE_EVENT_PHASE_END, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onRasterTaskEnd)), m_client);
+        dispatcher->addListener(InstrumentationEvents::Layer, TRACE_EVENT_PHASE_DELETE_OBJECT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onLayerDeleted)), m_client);
+        dispatcher->addListener(InstrumentationEvents::RequestMainThreadFrame, TRACE_EVENT_PHASE_INSTANT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onRequestMainThreadFrame)), m_client);
+        dispatcher->addListener(InstrumentationEvents::ActivateLayerTree, TRACE_EVENT_PHASE_INSTANT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onActivateLayerTree)), m_client);
+        dispatcher->addListener(InstrumentationEvents::DrawFrame, TRACE_EVENT_PHASE_INSTANT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onDrawFrame)), m_client);
+        dispatcher->addListener(PlatformInstrumentation::ImageDecodeEvent, TRACE_EVENT_PHASE_BEGIN, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onImageDecodeBegin)), m_client);
+        dispatcher->addListener(PlatformInstrumentation::ImageDecodeEvent, TRACE_EVENT_PHASE_END, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onImageDecodeEnd)), m_client);
+        dispatcher->addListener(PlatformInstrumentation::DrawLazyPixelRefEvent, TRACE_EVENT_PHASE_INSTANT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onDrawLazyPixelRef)), m_client);
+        dispatcher->addListener(PlatformInstrumentation::DecodeLazyPixelRefEvent, TRACE_EVENT_PHASE_BEGIN, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onDecodeLazyPixelRefBegin)), m_client);
+        dispatcher->addListener(PlatformInstrumentation::DecodeLazyPixelRefEvent, TRACE_EVENT_PHASE_END, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onDecodeLazyPixelRefEnd)), m_client);
+        dispatcher->addListener(PlatformInstrumentation::LazyPixelRef, TRACE_EVENT_PHASE_DELETE_OBJECT, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onLazyPixelRefDeleted)), m_client);
+        dispatcher->addListener(InstrumentationEvents::EmbedderCallback, TRACE_EVENT_PHASE_BEGIN, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onEmbedderCallbackBegin)), m_client);
+        dispatcher->addListener(InstrumentationEvents::EmbedderCallback, TRACE_EVENT_PHASE_END, adoptPtrWillBeNoop(new InspectorTimelineAgent::TraceEventListener(this, &InspectorTimelineAgent::onEmbedderCallbackEnd)), m_client);
 
         if (m_state->getBoolean(TimelineAgentState::includeGPUEvents)) {
             m_pendingGPURecord.clear();
             m_client->startGPUEventsRecording();
         }
     }
 }
 
 void InspectorTimelineAgent::stop(ErrorString* errorString, RefPtr<TypeBuilder::Array<TimelineEvent> >& events)
 {
@@ skipping 924 matching lines @@
 
 #ifndef NDEBUG
 bool TimelineRecordStack::isOpenRecordOfType(const String& type)
 {
     return !m_stack.isEmpty() && m_stack.last().type == type;
 }
 #endif
 
 } // namespace WebCore