Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/InspectorTimelineAgent.h

 /*
 * Copyright (C) 2012 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 71 matching lines @@
 class ScriptArguments;
 class ScriptCallStack;
 class TimelineRecordStack;
 class WebSocketHandshakeRequest;
 class WebSocketHandshakeResponse;
 class XMLHttpRequest;
 
 typedef String ErrorString;
 
 class InspectorTimelineAgent FINAL
-    : public TraceEventTarget<InspectorTimelineAgent>
-    , public InspectorBaseAgent<InspectorTimelineAgent>
+    : public InspectorBaseAgent<InspectorTimelineAgent>
     , public ScriptGCEventListener
     , public InspectorBackendDispatcher::TimelineCommandHandler
     , public PlatformInstrumentationClient {
     WTF_MAKE_NONCOPYABLE(InspectorTimelineAgent);
 public:
     enum InspectorType { PageInspector, WorkerInspector };
 
     class GPUEvent {
     public:
         enum Phase { PhaseBegin, PhaseEnd };
         GPUEvent(double timestamp, int phase, bool foreign, uint64_t usedGPUMemoryBytes, uint64_t limitGPUMemoryBytes) :
             timestamp(timestamp),
             phase(static_cast<Phase>(phase)),
             foreign(foreign),
             usedGPUMemoryBytes(usedGPUMemoryBytes),
             limitGPUMemoryBytes(limitGPUMemoryBytes) { }
         double timestamp;
         Phase phase;
         bool foreign;
         uint64_t usedGPUMemoryBytes;
         uint64_t limitGPUMemoryBytes;
     };
 
-    static PassOwnPtr<InspectorTimelineAgent> create(InspectorPageAgent* pageAgent, InspectorLayerTreeAgent* layerTreeAgent,
+    class TraceEventListener : public TraceEventDispatcher::TraceEventListener {

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

Can we rename this to TimelineAgentTraceEventListener? It's a bit confusing to
have two classes that have the same name.

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

Done. Changed to InspectorTimelineAgentTraceEventListener

+    public:
+        typedef void (InspectorTimelineAgent::*TraceEventHandlerMethod)(const TraceEventDispatcher::TraceEvent&);
+        TraceEventListener(InspectorTimelineAgent* instance, TraceEventHandlerMethod method)
+            : m_instance(instance)
+            , m_method(method)
+        {
+        }
+        virtual void call(const TraceEventDispatcher::TraceEvent& event) OVERRIDE
+        {
+            (m_instance->*m_method)(event);
+        }
+        virtual void* target() OVERRIDE
+        {
+            return m_instance;
+        }
+        virtual void trace(Visitor* visitor) OVERRIDE
+        {
+            visitor->trace(m_instance);
+            TraceEventDispatcher::TraceEventListener::trace(visitor);
+        }
+
+    private:
+        RawPtrWillBeMember<InspectorTimelineAgent> m_instance;
+        TraceEventHandlerMethod m_method;
+    };
+
+    static PassOwnPtrWillBeRawPtr<InspectorTimelineAgent> create(InspectorPageAgent* pageAgent, InspectorLayerTreeAgent* layerTreeAgent,
         InspectorOverlay* overlay, InspectorType type, InspectorClient* client)
     {
-        return adoptPtr(new InspectorTimelineAgent(pageAgent, layerTreeAgent, overlay, type, client));
+        return adoptPtrWillBeNoop(new InspectorTimelineAgent(pageAgent, layerTreeAgent, overlay, type, client));
     }
 
     virtual ~InspectorTimelineAgent();
+    virtual void trace(Visitor*) OVERRIDE;
 
     virtual void setFrontend(InspectorFrontend*) OVERRIDE;
     virtual void clearFrontend() OVERRIDE;
     virtual void restore() OVERRIDE;
 
     virtual void enable(ErrorString*) OVERRIDE;
     virtual void disable(ErrorString*) OVERRIDE;
     virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* bufferEvents, const String* liveEvents, const bool* includeCounters, const bool* includeGPUEvents) OVERRIDE;
     virtual void stop(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Timeline::TimelineEvent> >& events) OVERRIDE;
 
@@ skipping 145 matching lines @@
 
     double timestamp();
 
     LocalFrame* mainFrame() const;
 
     bool isStarted();
     void innerStart();
     void innerStop(bool fromConsole);
     void setLiveEvents(const String&);
 
-    InspectorPageAgent* m_pageAgent;
-    InspectorLayerTreeAgent* m_layerTreeAgent;
+    RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
+    RawPtrWillBeMember<InspectorLayerTreeAgent> m_layerTreeAgent;
     InspectorFrontend::Timeline* m_frontend;
     InspectorClient* m_client;
     InspectorOverlay* m_overlay;
     InspectorType m_inspectorType;
 
     int m_id;
     unsigned long long m_layerTreeId;
 
     int m_maxCallStackDepth;
 
@@ skipping 15 matching lines @@
     typedef HashMap<ThreadIdentifier, TimelineThreadState> ThreadStateMap;
     ThreadStateMap m_threadStates;
     bool m_mayEmitFirstPaint;
     HashSet<String> m_liveEvents;
     double m_lastProgressTimestamp;
 };
 
 } // namespace WebCore
 
 #endif // !defined(InspectorTimelineAgent_h)