Index: Source/core/inspector/InspectorDOMAgent.cpp |
diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp |
index 2610e360a4cb7329b480c93f11c07c3c2bd43439..95b85cf204d5199997515d1215cac225d2476b83 100644 |
--- a/Source/core/inspector/InspectorDOMAgent.cpp |
+++ b/Source/core/inspector/InspectorDOMAgent.cpp |
@@ -180,18 +180,19 @@ static Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformTouchEvent& ev |
return hoveredNodeForPoint(frame, roundedIntPoint(points[0].pos()), ignorePointerEventsNone); |
} |
-class RevalidateStyleAttributeTask { |
- WTF_MAKE_FAST_ALLOCATED; |
+class RevalidateStyleAttributeTask : public NoBaseWillBeGarbageCollectedFinalized<RevalidateStyleAttributeTask> { |
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
public: |
RevalidateStyleAttributeTask(InspectorDOMAgent*); |
void scheduleFor(Element*); |
void reset() { m_timer.stop(); } |
void onTimer(Timer<RevalidateStyleAttributeTask>*); |
+ void trace(Visitor*); |
private: |
- InspectorDOMAgent* m_domAgent; |
+ RawPtrWillBeMember<InspectorDOMAgent> m_domAgent; |
Timer<RevalidateStyleAttributeTask> m_timer; |
- WillBePersistentHeapHashSet<RefPtrWillBeMember<Element> > m_elements; |
+ WillBeHeapHashSet<RefPtrWillBeMember<Element> > m_elements; |
}; |
RevalidateStyleAttributeTask::RevalidateStyleAttributeTask(InspectorDOMAgent* domAgent) |
@@ -218,6 +219,12 @@ void RevalidateStyleAttributeTask::onTimer(Timer<RevalidateStyleAttributeTask>*) |
m_elements.clear(); |
} |
+void RevalidateStyleAttributeTask::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_domAgent); |
+ visitor->trace(m_elements); |
+} |
+ |
String InspectorDOMAgent::toErrorString(ExceptionState& exceptionState) |
{ |
if (exceptionState.hadException()) |
@@ -1912,7 +1919,7 @@ void InspectorDOMAgent::didInvalidateStyleAttr(Node* node) |
return; |
if (!m_revalidateStyleAttrTask) |
- m_revalidateStyleAttrTask = adoptPtr(new RevalidateStyleAttributeTask(this)); |
+ m_revalidateStyleAttrTask = adoptPtrWillBeNoop(new RevalidateStyleAttributeTask(this)); |
m_revalidateStyleAttrTask->scheduleFor(toElement(node)); |
} |
@@ -2111,6 +2118,7 @@ void InspectorDOMAgent::trace(Visitor* visitor) |
#endif |
visitor->trace(m_idToNodesMap); |
visitor->trace(m_document); |
+ visitor->trace(m_revalidateStyleAttrTask); |
visitor->trace(m_searchResults); |
visitor->trace(m_history); |
visitor->trace(m_domEditor); |