Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/InspectorController.h

 /*
  * 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 50 matching lines @@
 class InstrumentingAgents;
 class IntPoint;
 class IntSize;
 class Page;
 class PlatformGestureEvent;
 class PlatformKeyboardEvent;
 class PlatformMouseEvent;
 class PlatformTouchEvent;
 class Node;
 
-class InspectorController {
+class InspectorController : public NoBaseWillBeGarbageCollectedFinalized<InspectorController> {
     WTF_MAKE_NONCOPYABLE(InspectorController);
-    WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     ~InspectorController();
+    void trace(Visitor*);
 
-    static PassOwnPtr<InspectorController> create(Page*, InspectorClient*);
+    static PassOwnPtrWillBeRawPtr<InspectorController> create(Page*, InspectorClient*);
 
     // Settings overrides.
     void setTextAutosizingEnabled(bool);
     void setDeviceScaleAdjustment(float);
 
     void willBeDestroyed();
-    void registerModuleAgent(PassOwnPtr<InspectorAgent>);
+    void registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>);
 
     void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient>);
     void didClearDocumentOfWindowObject(LocalFrame*);
     void setInjectedScriptForOrigin(const String& origin, const String& source);
 
     void dispatchMessageFromFrontend(const String& message);
 
     void connectFrontend(InspectorFrontendChannel*);
     void disconnectFrontend();
     void reconnectFrontend();
@@ skipping 33 matching lines @@
 
     void scriptsEnabled(bool);
 
     void willAddPageOverlay(const GraphicsLayer*);
     void didRemovePageOverlay(const GraphicsLayer*);
 
 private:
     InspectorController(Page*, InspectorClient*);
 
     void initializeDeferredAgents();
+    InspectorAgentRegistry& agents() { return *m_agents; }
 
     friend InstrumentingAgents* instrumentationForPage(Page*);
 
-    RefPtr<InstrumentingAgents> m_instrumentingAgents;
+    RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
     OwnPtr<InjectedScriptManager> m_injectedScriptManager;
     OwnPtr<InspectorCompositeState> m_state;
     OwnPtr<InspectorOverlay> m_overlay;
 
-    InspectorDOMAgent* m_domAgent;
-    InspectorPageAgent* m_pageAgent;
-    InspectorTimelineAgent* m_timelineAgent;
-    InspectorLayerTreeAgent* m_layerTreeAgent;
-    InspectorTracingAgent* m_tracingAgent;
+    RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;
+    RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
+    RawPtrWillBeMember<InspectorTimelineAgent> m_timelineAgent;
+    RawPtrWillBeMember<InspectorLayerTreeAgent> m_layerTreeAgent;
+    RawPtrWillBeMember<InspectorTracingAgent> m_tracingAgent;
 
     RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
     OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
     OwnPtr<InspectorFrontend> m_inspectorFrontend;
-    Page* m_page;
+    RawPtrWillBeMember<Page> m_page;
     InspectorClient* m_inspectorClient;

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

SAFE: InspectorClient is WebViewImpl . Cleared in
InspectorController::willBeDestroyed.

-    InspectorAgentRegistry m_agents;
-    Vector<InspectorAgent*> m_moduleAgents;
+    OwnPtrWillBeMember<InspectorAgentRegistry> m_agents;
+    WillBeHeapVector<RawPtrWillBeMember<InspectorAgent> > m_moduleAgents;
     bool m_isUnderTest;
     bool m_deferredAgentsInitialized;
 };
 
 }
 
 
 #endif // !defined(InspectorController_h)