Oilpan: Prepare moving InspectorAgent related classes to oilpan

Source/core/inspector/InspectorDOMAgent.cpp

Index: Source/core/inspector/InspectorDOMAgent.cpp
diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp
index 5a0c4b34c5f44ad72a035940a69b6e98e85f2656..cd08153d085d308053ee06ad1a0bb892537e8940 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> {

[haraken, 2014/07/25 01:38:44]

Add FINAL.

[keishi, 2014/07/25 03:56:28]

Done.

+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
-    RevalidateStyleAttributeTask(InspectorDOMAgent*);
+    explicit 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())
@@ -655,8 +662,7 @@ int InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
 
     if (!m_document)
         return 0;
-    // FIXME: Oilpan: .get will be unnecessary if m_document is a Member<>.
-    if (!m_documentNodeToIdMap->contains(m_document.get()))
+    if (!m_documentNodeToIdMap->contains(m_document))
         return 0;
 
     // Return id in case the node is known.
@@ -1936,7 +1942,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));
 }
 
@@ -2116,8 +2122,7 @@ PassRefPtr<TypeBuilder::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(No
 
 bool InspectorDOMAgent::pushDocumentUponHandlelessOperation(ErrorString* errorString)
 {
-    // FIXME: Oilpan: .get will be unnecessary if m_document is a Member<>.
-    if (!m_documentNodeToIdMap->contains(m_document.get())) {
+    if (!m_documentNodeToIdMap->contains(m_document)) {
         RefPtr<TypeBuilder::DOM::Node> root;
         getDocument(errorString, root);
         return errorString->isEmpty();
@@ -2129,6 +2134,7 @@ void InspectorDOMAgent::trace(Visitor* visitor)
 {
     visitor->trace(m_domListener);
     visitor->trace(m_pageAgent);
+    visitor->trace(m_injectedScriptManager);
 #if ENABLE(OILPAN)
     visitor->trace(m_documentNodeToIdMap);
     visitor->trace(m_danglingNodeToIdMaps);
@@ -2136,6 +2142,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);