Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(657)

Unified Diff: Source/core/inspector/InspectorCSSAgent.cpp

Issue 306053010: Tried using CrossThreadPersistent for workerDebuggerAgents (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorCSSAgent.h ('k') | Source/core/inspector/InspectorCanvasAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorCSSAgent.cpp
diff --git a/Source/core/inspector/InspectorCSSAgent.cpp b/Source/core/inspector/InspectorCSSAgent.cpp
index b2b944ca10f3dfe542a590bbadb407b19f17d4ea..c6d6b7fcd522f05a27ef23c2e2275f53e1bbb0b7 100644
--- a/Source/core/inspector/InspectorCSSAgent.cpp
+++ b/Source/core/inspector/InspectorCSSAgent.cpp
@@ -202,7 +202,7 @@ public:
return String::format("SetStyleSheetText %s", m_styleSheet->id().utf8().data());
}
- virtual void merge(PassRefPtr<Action> action) OVERRIDE
+ virtual void merge(PassRefPtrWillBeRawPtr<Action> action) OVERRIDE
{
ASSERT(action->mergeId() == mergeId());
@@ -210,8 +210,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;
};
@@ -258,7 +264,7 @@ public:
return String::format("SetPropertyText %s:%u:%s", m_styleSheet->id().utf8().data(), m_propertyIndex, m_overwrite ? "true" : "false");
}
- virtual void merge(PassRefPtr<Action> action) OVERRIDE
+ virtual void merge(PassRefPtrWillBeRawPtr<Action> action) OVERRIDE
{
ASSERT(action->mergeId() == mergeId());
@@ -266,8 +272,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;
@@ -304,8 +316,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;
@@ -340,10 +358,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;
@@ -396,7 +420,7 @@ void InspectorCSSAgent::clearFrontend()
void InspectorCSSAgent::discardAgent()
{
m_domAgent->setDOMListener(0);
- m_domAgent = 0;
+ m_domAgent = nullptr;
}
void InspectorCSSAgent::restore()
@@ -578,7 +602,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);
@@ -818,7 +842,7 @@ void InspectorCSSAgent::setStyleSheetText(ErrorString* errorString, const String
}
TrackExceptionState exceptionState;
- m_domAgent->history()->perform(adoptRef(new SetStyleSheetTextAction(inspectorStyleSheet, text)), exceptionState);
+ m_domAgent->history()->perform(adoptRefWillBeNoop(new SetStyleSheetTextAction(inspectorStyleSheet, text)), exceptionState);
*errorString = InspectorDOMAgent::toErrorString(exceptionState);
}
@@ -880,7 +904,7 @@ void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const String&
}
TrackExceptionState exceptionState;
- bool success = m_domAgent->history()->perform(adoptRef(new SetPropertyTextAction(inspectorStyleSheet, compoundId, propertyIndex, text, overwrite)), exceptionState);
+ bool success = m_domAgent->history()->perform(adoptRefWillBeNoop(new SetPropertyTextAction(inspectorStyleSheet, compoundId, propertyIndex, text, overwrite)), exceptionState);
if (success)
result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
*errorString = InspectorDOMAgent::toErrorString(exceptionState);
@@ -901,7 +925,7 @@ void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const String&
}
TrackExceptionState exceptionState;
- bool success = m_domAgent->history()->perform(adoptRef(new SetRuleSelectorAction(inspectorStyleSheet, compoundId, selector)), exceptionState);
+ bool success = m_domAgent->history()->perform(adoptRefWillBeNoop(new SetRuleSelectorAction(inspectorStyleSheet, compoundId, selector)), exceptionState);
if (success) {
CSSStyleRule* rule = inspectorStyleSheet->ruleForId(compoundId);
result = inspectorStyleSheet->buildObjectForRule(rule, buildMediaListChain(rule));
@@ -941,7 +965,7 @@ void InspectorCSSAgent::addRule(ErrorString* errorString, const String& styleShe
return;
TrackExceptionState exceptionState;
- RefPtr<AddRuleAction> action = adoptRef(new AddRuleAction(inspectorStyleSheet, selector));
+ RefPtrWillBeRawPtr<AddRuleAction> action = adoptRefWillBeNoop(new AddRuleAction(inspectorStyleSheet, selector));
bool success = m_domAgent->history()->perform(action, exceptionState);
if (!success) {
*errorString = InspectorDOMAgent::toErrorString(exceptionState);
@@ -1090,7 +1114,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();
@@ -1145,7 +1169,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();
@@ -1177,7 +1201,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();
@@ -1439,5 +1463,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
« no previous file with comments | « Source/core/inspector/InspectorCSSAgent.h ('k') | Source/core/inspector/InspectorCanvasAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698