Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Unified Diff: Source/core/inspector/InspectorController.h

Issue 306053010: Tried using CrossThreadPersistent for workerDebuggerAgents (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorConsoleAgent.cpp ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorController.h
diff --git a/Source/core/inspector/InspectorController.h b/Source/core/inspector/InspectorController.h
index 8fdffd46864231a19475fe22cd345614ac4a8b12..6df1351e85a01b21c8eb889de4414c78157ac742 100644
--- a/Source/core/inspector/InspectorController.h
+++ b/Source/core/inspector/InspectorController.h
@@ -68,20 +68,21 @@ 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*);
@@ -138,24 +139,24 @@ private:
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;
InspectorClient* m_inspectorClient;
- InspectorAgentRegistry m_agents;
- Vector<InspectorAgent*> m_moduleAgents;
+ OwnPtrWillBeMember<InspectorAgentRegistry> m_agents;
+ WillBeHeapVector<RawPtrWillBeMember<InspectorAgent> > m_moduleAgents;
bool m_isUnderTest;
bool m_deferredAgentsInitialized;
};
« no previous file with comments | « Source/core/inspector/InspectorConsoleAgent.cpp ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698