| Index: Source/core/inspector/InspectorCSSAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorCSSAgent.cpp b/Source/core/inspector/InspectorCSSAgent.cpp
|
| index dab44c2d2a33470b5c2bdcba5f085f78d1c0a410..26adf36e921062921fd57727da4fea456a38acf4 100644
|
| --- a/Source/core/inspector/InspectorCSSAgent.cpp
|
| +++ b/Source/core/inspector/InspectorCSSAgent.cpp
|
| @@ -208,8 +208,14 @@ public:
|
| m_text = other->m_text;
|
| }
|
|
|
| + virtual void trace(Visitor* visitor) OVERRIDE
|
| + {
|
| + visitor->trace(m_styleSheet);
|
| + InspectorCSSAgent::StyleSheetAction::trace(visitor);
|
| + }
|
| +
|
| private:
|
| - RefPtr<InspectorStyleSheetBase> m_styleSheet;
|
| + RefPtrWillBeMember<InspectorStyleSheetBase> m_styleSheet;
|
| String m_text;
|
| String m_oldText;
|
| };
|
| @@ -264,8 +270,14 @@ public:
|
| m_text = other->m_text;
|
| }
|
|
|
| + virtual void trace(Visitor* visitor) OVERRIDE
|
| + {
|
| + visitor->trace(m_styleSheet);
|
| + InspectorCSSAgent::StyleSheetAction::trace(visitor);
|
| + }
|
| +
|
| private:
|
| - RefPtr<InspectorStyleSheetBase> m_styleSheet;
|
| + RefPtrWillBeMember<InspectorStyleSheetBase> m_styleSheet;
|
| InspectorCSSId m_cssId;
|
| unsigned m_propertyIndex;
|
| String m_text;
|
| @@ -302,8 +314,14 @@ public:
|
| return m_styleSheet->setRuleSelector(m_cssId, m_selector, exceptionState);
|
| }
|
|
|
| + virtual void trace(Visitor* visitor) OVERRIDE
|
| + {
|
| + visitor->trace(m_styleSheet);
|
| + InspectorCSSAgent::StyleSheetAction::trace(visitor);
|
| + }
|
| +
|
| private:
|
| - RefPtr<InspectorStyleSheet> m_styleSheet;
|
| + RefPtrWillBeMember<InspectorStyleSheet> m_styleSheet;
|
| InspectorCSSId m_cssId;
|
| String m_selector;
|
| String m_oldSelector;
|
| @@ -338,10 +356,16 @@ public:
|
| return true;
|
| }
|
|
|
| + virtual void trace(Visitor* visitor) OVERRIDE
|
| + {
|
| + visitor->trace(m_styleSheet);
|
| + InspectorCSSAgent::StyleSheetAction::trace(visitor);
|
| + }
|
| +
|
| InspectorCSSId newRuleId() { return m_newId; }
|
|
|
| private:
|
| - RefPtr<InspectorStyleSheet> m_styleSheet;
|
| + RefPtrWillBeMember<InspectorStyleSheet> m_styleSheet;
|
| InspectorCSSId m_newId;
|
| String m_selector;
|
| String m_oldSelector;
|
| @@ -394,7 +418,7 @@ void InspectorCSSAgent::clearFrontend()
|
| void InspectorCSSAgent::discardAgent()
|
| {
|
| m_domAgent->setDOMListener(0);
|
| - m_domAgent = 0;
|
| + m_domAgent = nullptr;
|
| }
|
|
|
| void InspectorCSSAgent::restore()
|
| @@ -576,7 +600,7 @@ void InspectorCSSAgent::setActiveStyleSheets(Document* document, const Vector<CS
|
|
|
| for (HashSet<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);
|
| @@ -1088,7 +1112,7 @@ InspectorStyleSheetForInlineStyle* InspectorCSSAgent::asInspectorStyleSheet(Elem
|
| return 0;
|
|
|
| String newStyleSheetId = String::number(m_lastStyleSheetId++);
|
| - RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(newStyleSheetId, element, this);
|
| + RefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(newStyleSheetId, element, this);
|
| m_idToInspectorStyleSheetForInlineStyle.set(newStyleSheetId, inspectorStyleSheet);
|
| m_nodeToInspectorStyleSheet.set(element, inspectorStyleSheet);
|
| return inspectorStyleSheet.get();
|
| @@ -1143,7 +1167,7 @@ void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, Vector<CSS
|
|
|
| InspectorStyleSheet* InspectorCSSAgent::bindStyleSheet(CSSStyleSheet* styleSheet)
|
| {
|
| - RefPtr<InspectorStyleSheet> inspectorStyleSheet = m_cssStyleSheetToInspectorStyleSheet.get(styleSheet);
|
| + RefPtrWillBeRawPtr<InspectorStyleSheet> inspectorStyleSheet = m_cssStyleSheetToInspectorStyleSheet.get(styleSheet);
|
| if (!inspectorStyleSheet) {
|
| String id = String::number(m_lastStyleSheetId++);
|
| Document* document = styleSheet->ownerDocument();
|
| @@ -1175,7 +1199,7 @@ InspectorStyleSheet* InspectorCSSAgent::viaInspectorStyleSheet(Document* documen
|
| if (!document->isHTMLDocument() && !document->isSVGDocument())
|
| return 0;
|
|
|
| - RefPtr<InspectorStyleSheet> inspectorStyleSheet = m_documentToViaInspectorStyleSheet.get(document);
|
| + RefPtrWillBeRawPtr<InspectorStyleSheet> inspectorStyleSheet = m_documentToViaInspectorStyleSheet.get(document);
|
| if (inspectorStyleSheet || !createIfAbsent)
|
| return inspectorStyleSheet.get();
|
|
|
| @@ -1392,5 +1416,19 @@ 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_idToInspectorStyleSheet);
|
| + visitor->trace(m_idToInspectorStyleSheetForInlineStyle);
|
| + visitor->trace(m_cssStyleSheetToInspectorStyleSheet);
|
| + visitor->trace(m_inspectorUserAgentStyleSheet);
|
| + visitor->trace(m_nodeToInspectorStyleSheet);
|
| + visitor->trace(m_documentToViaInspectorStyleSheet);
|
| + InspectorBaseAgent::trace(visitor);
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|
|
|