| Index: Source/core/inspector/InspectorCSSAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorCSSAgent.cpp b/Source/core/inspector/InspectorCSSAgent.cpp
|
| index 02a8414a0de180f195f617565163a34dd790d30a..e25db9077bc8e09b8bf10124b48b572e7e61c670 100644
|
| --- a/Source/core/inspector/InspectorCSSAgent.cpp
|
| +++ b/Source/core/inspector/InspectorCSSAgent.cpp
|
| @@ -209,8 +209,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;
|
| };
|
| @@ -265,8 +271,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;
|
| @@ -303,8 +315,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;
|
| @@ -339,10 +357,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;
|
| @@ -642,7 +666,7 @@ void InspectorCSSAgent::getMediaQueries(ErrorString* errorString, RefPtr<TypeBui
|
| {
|
| medias = TypeBuilder::Array<TypeBuilder::CSS::CSSMedia>::create();
|
| for (IdToInspectorStyleSheet::iterator it = m_idToInspectorStyleSheet.begin(); it != m_idToInspectorStyleSheet.end(); ++it) {
|
| - RefPtr<InspectorStyleSheet> styleSheet = it->value;
|
| + RefPtrWillBeRawPtr<InspectorStyleSheet> styleSheet = it->value;
|
| collectMediaQueriesFromStyleSheet(styleSheet->pageStyleSheet(), medias.get());
|
| const CSSRuleVector& flatRules = styleSheet->flatRules();
|
| for (unsigned i = 0; i < flatRules.size(); ++i) {
|
| @@ -1150,7 +1174,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();
|
| @@ -1204,7 +1228,7 @@ void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, WillBeHeap
|
|
|
| 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();
|
| @@ -1236,7 +1260,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();
|
|
|
| @@ -1458,9 +1482,12 @@ 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_documentToCSSStyleSheets);
|
| visitor->trace(m_invalidatedDocuments);
|
| + visitor->trace(m_nodeToInspectorStyleSheet);
|
| visitor->trace(m_documentToViaInspectorStyleSheet);
|
| visitor->trace(m_inspectorUserAgentStyleSheet);
|
| InspectorBaseAgent::trace(visitor);
|
|
|