Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/InspectorBaseAgent.h

Index: Source/core/inspector/InspectorBaseAgent.h
diff --git a/Source/core/inspector/InspectorBaseAgent.h b/Source/core/inspector/InspectorBaseAgent.h
index eae8210979a35633618be2aa14522043f1123730..b77957da175996a6f8f4e5f251e3f77fc10473b8 100644
--- a/Source/core/inspector/InspectorBaseAgent.h
+++ b/Source/core/inspector/InspectorBaseAgent.h
@@ -32,6 +32,8 @@
 #define InspectorBaseAgent_h
 
 #include "InspectorBackendDispatcher.h"
+#include "core/inspector/InstrumentingAgents.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
@@ -43,10 +45,11 @@ class InspectorCompositeState;
 class InspectorState;
 class InstrumentingAgents;
 
-class InspectorAgent {
+class InspectorAgent : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgent> {
 public:
     explicit InspectorAgent(const String&);
     virtual ~InspectorAgent();
+    virtual void trace(Visitor*);

[haraken, 2014/06/12 05:53:00]

Add OVERRIDE.

[keishi, 2014/06/13 03:37:33]

This is the base class.

 
     virtual void init() { }
     virtual void setFrontend(InspectorFrontend*) { }
@@ -61,17 +64,17 @@ public:
     void appended(InstrumentingAgents*, InspectorState*);
 
 protected:
-    InstrumentingAgents* m_instrumentingAgents;
+    RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
     InspectorState* m_state;

[haraken, 2014/06/12 05:53:00]

This raw pointer looks safe because InspectorCompositeState::m_inspectorStateMap
keeps the InspectorState alive while InspectorAgent holds the InspectorState.

However, the lifetime relationship is complicated, so it would be better to move
InspectorState to the heap.

Shall we add a FIXME and address in a follow-up?

[keishi, 2014/06/13 03:37:33]

Done.

 
 private:
     String m_name;
 };
 
-class InspectorAgentRegistry {
+class InspectorAgentRegistry : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgentRegistry> {

[haraken, 2014/06/12 05:53:00]

Add FINAL.

[keishi, 2014/06/13 03:37:32]

Done.

 public:
     InspectorAgentRegistry(InstrumentingAgents*, InspectorCompositeState*);
-    void append(PassOwnPtr<InspectorAgent>);
+    void append(PassOwnPtrWillBeRawPtr<InspectorAgent>);
 
     void setFrontend(InspectorFrontend*);
     void clearFrontend();
@@ -80,10 +83,12 @@ public:
     void discardAgents();
     void flushPendingFrontendMessages();
 
+    void trace(Visitor*);
+
 private:
-    InstrumentingAgents* m_instrumentingAgents;
+    RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
     InspectorCompositeState* m_inspectorState;

[keishi, 2014/06/11 14:10:53]

SAFE: InspectorAgentRegistry and InspectorCompositeState are owned by
InspectorController so they die together.

[haraken, 2014/06/12 05:53:00]

I agree that this is safe, but it would be better to move
InspectorCompositeState to the heap. If someone (other than InspectorController)
starts holding a Member to InspectorAgentRegistry in the future, there is no
guarantee that the InspectorAgentRegistry and the InspectorCompositeState die
together. Then m_inspectorState can be a stale pointer.

Shall we add a FIXME and address in a follow-up?

[keishi, 2014/06/13 03:37:33]

Done.

-    Vector<OwnPtr<InspectorAgent> > m_agents;
+    WillBeHeapVector<OwnPtrWillBeMember<InspectorAgent> > m_agents;
 };
 
 template<typename T>