Oilpan: Prepare moving InspectorAgent related classes 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 140 matching lines @@
     {
     }
     RefPtr<TimelineEvent> record;
     RefPtr<JSONObject> data;
     RefPtr<TypeBuilder::Array<TimelineEvent> > children;
     String type;
     bool skipWhenUnbalanced;
 };
 
 class TimelineRecordStack {
+    DISALLOW_ALLOCATION();
 private:
     struct Entry {
         Entry(PassRefPtr<TimelineEvent> record, const String& type)
             : record(record)
             , children(TypeBuilder::Array<TimelineEvent>::create())
 #ifndef NDEBUG
             , type(type)
 #endif
         {
         }
 
         RefPtr<TimelineEvent> record;
         RefPtr<TypeBuilder::Array<TimelineEvent> > children;
 #ifndef NDEBUG
         String type;
 #endif
     };
 
 public:
-    TimelineRecordStack() : m_timelineAgent(0) { }
+    TimelineRecordStack() : m_timelineAgent(nullptr) { }
     TimelineRecordStack(InspectorTimelineAgent*);

[haraken, 2014/06/19 05:49:53]

Add explicit.

[keishi, 2014/07/24 02:15:02]

Done.

 
     void addScopedRecord(PassRefPtr<TimelineEvent> record, const String& type);
     void closeScopedRecord(double endTime);
     void addInstantRecord(PassRefPtr<TimelineEvent> record);
 
 #ifndef NDEBUG
     bool isOpenRecordOfType(const String& type);
 #endif
 
+    void trace(Visitor*);
+
 private:
     void send(PassRefPtr<JSONObject>);
 
-    InspectorTimelineAgent* m_timelineAgent;
+    RawPtrWillBeMember<InspectorTimelineAgent> m_timelineAgent;
     Vector<Entry> m_stack;
 };
 
-struct TimelineThreadState {
+struct TimelineThreadState : public NoBaseWillBeGarbageCollectedFinalized<TimelineThreadState> {

[haraken, 2014/06/19 05:49:53]

I think you can use ALLOW_ONLY_INLINE_ALLOCATION instead of making it
GC-allocated.

[haraken, 2014/06/19 05:49:53]

Nit: struct => class

[keishi, 2014/07/24 02:15:02]

Done.

[keishi, 2014/07/24 02:15:02]

Should this be a class? The accessors are public.

     TimelineThreadState() { }
 
     TimelineThreadState(InspectorTimelineAgent* timelineAgent)
         : recordStack(timelineAgent)
         , inKnownLayerTask(false)
         , decodedPixelRefId(0)
     {
     }
 
+    void trace(Visitor*);
+
     TimelineRecordStack recordStack;
     bool inKnownLayerTask;
     unsigned long long decodedPixelRefId;
 };
 
 struct TimelineImageInfo {
     int backendNodeId;
     String url;
 
     TimelineImageInfo() : backendNodeId(0) { }
@@ skipping 40 matching lines @@
 }
 
 InspectorTimelineAgent::~InspectorTimelineAgent()
 {
 }
 
 void InspectorTimelineAgent::trace(Visitor* visitor)
 {
     visitor->trace(m_pageAgent);
     visitor->trace(m_layerTreeAgent);
+    visitor->trace(m_threadStates);
     InspectorBaseAgent::trace(visitor);
 }
 
 void InspectorTimelineAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->timeline();
 }
 
 void InspectorTimelineAgent::clearFrontend()
 {
@@ skipping 923 matching lines @@
     if (hasLowLevelDetails && !m_platformInstrumentationClientInstalledAtStackDepth && !PlatformInstrumentation::hasClient()) {
         m_platformInstrumentationClientInstalledAtStackDepth = m_recordStack.size();
         PlatformInstrumentation::setClient(this);
     }
 }
 
 TimelineThreadState& InspectorTimelineAgent::threadState(ThreadIdentifier thread)
 {
     ThreadStateMap::iterator it = m_threadStates.find(thread);
     if (it != m_threadStates.end())
-        return it->value;
-    return m_threadStates.add(thread, TimelineThreadState(this)).storedValue->value;
+        return *(it->value);
+    return *(m_threadStates.add(thread, adoptPtrWillBeNoop(new TimelineThreadState(this))).storedValue->value);
 }
 
 void InspectorTimelineAgent::commitFrameRecord()
 {
     if (!m_pendingFrameRecord)
         return;
     innerAddRecordToTimeline(m_pendingFrameRecord.release());
 }
 
 void InspectorTimelineAgent::clearRecordStack()
@@ skipping 87 matching lines @@
         m_stack.last().children->addItem(record);
 }
 
 #ifndef NDEBUG
 bool TimelineRecordStack::isOpenRecordOfType(const String& type)
 {
     return !m_stack.isEmpty() && m_stack.last().type == type;
 }
 #endif
 
+void TimelineRecordStack::trace(Visitor* visitor)
+{
+    visitor->trace(m_timelineAgent);
+}
+
+void TimelineThreadState::trace(Visitor* visitor)
+{
+    recordStack.trace(visitor);

[haraken, 2014/06/19 05:49:53]

visitor->trace(recordStack) should work.

[keishi, 2014/07/24 02:15:02]

Done.

+}
+
 } // namespace WebCore