Index: Source/core/inspector/InspectorTimelineAgent.h |
diff --git a/Source/core/inspector/InspectorTimelineAgent.h b/Source/core/inspector/InspectorTimelineAgent.h |
index 1c5375532cf2f964e0e2f89fbb387442da3a70ee..826210e388b2d94bf3e7148426c252fbde8bea8d 100644 |
--- a/Source/core/inspector/InspectorTimelineAgent.h |
+++ b/Source/core/inspector/InspectorTimelineAgent.h |
@@ -89,8 +89,8 @@ class XMLHttpRequest; |
typedef String ErrorString; |
class InspectorTimelineAgent FINAL |
- : public TraceEventTarget<InspectorTimelineAgent> |
- , public InspectorBaseAgent<InspectorTimelineAgent> |
+ : public InspectorBaseAgent<InspectorTimelineAgent> |
+ , public TraceEventTarget<InspectorTimelineAgent> |
, public ScriptGCEventListener |
, public InspectorBackendDispatcher::TimelineCommandHandler |
, public PlatformInstrumentationClient { |
@@ -114,13 +114,14 @@ public: |
uint64_t limitGPUMemoryBytes; |
}; |
- static PassOwnPtr<InspectorTimelineAgent> create(InspectorPageAgent* pageAgent, InspectorLayerTreeAgent* layerTreeAgent, |
+ 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; |
@@ -286,8 +287,8 @@ private: |
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; |