Index: Source/core/inspector/InspectorTimelineAgent.cpp |
diff --git a/Source/core/inspector/InspectorTimelineAgent.cpp b/Source/core/inspector/InspectorTimelineAgent.cpp |
index 06e5d71a21859747df54572807c7dce7435be4a4..8ae63728d17c1f358a082b62995193c74a6a4338 100644 |
--- a/Source/core/inspector/InspectorTimelineAgent.cpp |
+++ b/Source/core/inspector/InspectorTimelineAgent.cpp |
@@ -189,6 +189,7 @@ struct TimelineRecordEntry { |
}; |
class TimelineRecordStack { |
+ DISALLOW_ALLOCATION(); |
private: |
struct Entry { |
Entry(PassRefPtr<TimelineEvent> record, const String& type) |
@@ -208,8 +209,8 @@ private: |
}; |
public: |
- TimelineRecordStack() : m_timelineAgent(0) { } |
- TimelineRecordStack(InspectorTimelineAgent*); |
+ TimelineRecordStack() : m_timelineAgent(nullptr) { } |
+ explicit TimelineRecordStack(InspectorTimelineAgent*); |
void addScopedRecord(PassRefPtr<TimelineEvent> record, const String& type); |
void closeScopedRecord(double endTime); |
@@ -219,14 +220,18 @@ public: |
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 { |
+ ALLOW_ONLY_INLINE_ALLOCATION(); |
+public: |
TimelineThreadState() { } |
TimelineThreadState(InspectorTimelineAgent* timelineAgent) |
@@ -236,6 +241,8 @@ struct TimelineThreadState { |
{ |
} |
+ void trace(Visitor*); |
+ |
TimelineRecordStack recordStack; |
bool inKnownLayerTask; |
unsigned long long decodedPixelRefId; |
@@ -296,6 +303,9 @@ void InspectorTimelineAgent::trace(Visitor* visitor) |
{ |
visitor->trace(m_pageAgent); |
visitor->trace(m_layerTreeAgent); |
+#if ENABLE(OILPAN) |
+ visitor->trace(m_threadStates); |
+#endif |
InspectorBaseAgent::trace(visitor); |
} |
@@ -1346,5 +1356,15 @@ bool TimelineRecordStack::isOpenRecordOfType(const String& type) |
} |
#endif |
+void TimelineRecordStack::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_timelineAgent); |
+} |
+ |
+void TimelineThreadState::trace(Visitor* visitor) |
+{ |
+ visitor->trace(recordStack); |
+} |
+ |
} // namespace blink |