Index: Source/core/inspector/InspectorCSSAgent.cpp |
diff --git a/Source/core/inspector/InspectorCSSAgent.cpp b/Source/core/inspector/InspectorCSSAgent.cpp |
index 554696ef8e49339237bc6141c013128189211f4c..0ca4a70a4aea1f8bce2bad1fdd6c73cc07f1f0b8 100644 |
--- a/Source/core/inspector/InspectorCSSAgent.cpp |
+++ b/Source/core/inspector/InspectorCSSAgent.cpp |
@@ -395,7 +395,7 @@ void InspectorCSSAgent::clearFrontend() |
void InspectorCSSAgent::discardAgent() |
{ |
m_domAgent->setDOMListener(0); |
- m_domAgent = 0; |
+ m_domAgent = nullptr; |
} |
void InspectorCSSAgent::restore() |
@@ -408,9 +408,9 @@ void InspectorCSSAgent::flushPendingFrontendMessages() |
{ |
if (!m_invalidatedDocuments.size()) |
return; |
- HashSet<Document*> invalidatedDocuments; |
+ WillBeHeapHashSet<RawPtrWillBeMember<Document> > invalidatedDocuments; |
m_invalidatedDocuments.swap(&invalidatedDocuments); |
- for (HashSet<Document*>::iterator it = invalidatedDocuments.begin(); it != invalidatedDocuments.end(); ++it) |
+ for (WillBeHeapHashSet<RawPtrWillBeMember<Document> >::iterator it = invalidatedDocuments.begin(); it != invalidatedDocuments.end(); ++it) |
updateActiveStyleSheets(*it, ExistingFrontendRefresh); |
} |
@@ -554,16 +554,16 @@ void InspectorCSSAgent::setActiveStyleSheets(Document* document, const Vector<CS |
{ |
bool isInitialFrontendLoad = styleSheetsUpdateType == InitialFrontendLoad; |
- HashSet<CSSStyleSheet*>* documentCSSStyleSheets = m_documentToCSSStyleSheets.get(document); |
+ WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> >* documentCSSStyleSheets = m_documentToCSSStyleSheets.get(document); |
if (!documentCSSStyleSheets) { |
- documentCSSStyleSheets = new HashSet<CSSStyleSheet*>(); |
- OwnPtr<HashSet<CSSStyleSheet*> > documentCSSStyleSheetsPtr = adoptPtr(documentCSSStyleSheets); |
+ documentCSSStyleSheets = new WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> >(); |
+ OwnPtrWillBeRawPtr<WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> > > documentCSSStyleSheetsPtr = adoptPtrWillBeNoop(documentCSSStyleSheets); |
m_documentToCSSStyleSheets.set(document, documentCSSStyleSheetsPtr.release()); |
} |
- HashSet<CSSStyleSheet*> removedSheets(*documentCSSStyleSheets); |
+ WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> > removedSheets(*documentCSSStyleSheets); |
- HashSet<CSSStyleSheet*> addedSheets; |
+ WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> > addedSheets; |
for (Vector<CSSStyleSheet*>::const_iterator it = allSheetsVector.begin(); it != allSheetsVector.end(); ++it) { |
CSSStyleSheet* cssStyleSheet = *it; |
if (removedSheets.contains(cssStyleSheet)) { |
@@ -575,9 +575,9 @@ void InspectorCSSAgent::setActiveStyleSheets(Document* document, const Vector<CS |
} |
} |
- for (HashSet<CSSStyleSheet*>::iterator it = removedSheets.begin(); it != removedSheets.end(); ++it) { |
+ for (WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> >::iterator it = removedSheets.begin(); it != removedSheets.end(); ++it) { |
CSSStyleSheet* cssStyleSheet = *it; |
- RefPtr<InspectorStyleSheet> inspectorStyleSheet = m_cssStyleSheetToInspectorStyleSheet.get(cssStyleSheet); |
+ RefPtrWillBeRawPtr<InspectorStyleSheet> inspectorStyleSheet = m_cssStyleSheetToInspectorStyleSheet.get(cssStyleSheet); |
ASSERT(inspectorStyleSheet); |
documentCSSStyleSheets->remove(cssStyleSheet); |
@@ -588,7 +588,7 @@ void InspectorCSSAgent::setActiveStyleSheets(Document* document, const Vector<CS |
} |
} |
- for (HashSet<CSSStyleSheet*>::iterator it = addedSheets.begin(); it != addedSheets.end(); ++it) { |
+ for (WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> >::iterator it = addedSheets.begin(); it != addedSheets.end(); ++it) { |
CSSStyleSheet* cssStyleSheet = *it; |
bool isNew = isInitialFrontendLoad || !m_cssStyleSheetToInspectorStyleSheet.contains(cssStyleSheet); |
if (isNew) { |
@@ -1452,5 +1452,18 @@ void InspectorCSSAgent::resetPseudoStates() |
(*it)->setNeedsStyleRecalc(SubtreeStyleChange); |
} |
+void InspectorCSSAgent::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_domAgent); |
+ visitor->trace(m_pageAgent); |
+ visitor->trace(m_resourceAgent); |
+ visitor->trace(m_cssStyleSheetToInspectorStyleSheet); |
+ visitor->trace(m_documentToCSSStyleSheets); |
+ visitor->trace(m_invalidatedDocuments); |
+ visitor->trace(m_documentToViaInspectorStyleSheet); |
+ visitor->trace(m_inspectorUserAgentStyleSheet); |
+ InspectorBaseAgent::trace(visitor); |
+} |
+ |
} // namespace WebCore |