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

Unified Diff: Source/core/inspector/InspectorStyleSheet.h

Issue 323043002: Oilpan: Prepare moving InspectorAgent related classes to oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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/InspectorState.cpp ('k') | Source/core/inspector/InspectorStyleSheet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorStyleSheet.h
diff --git a/Source/core/inspector/InspectorStyleSheet.h b/Source/core/inspector/InspectorStyleSheet.h
index 80e2e6b45d24c0b9c8570111f521302d45271ea1..f98787421f174614ea0daecdd47acab97d80e528 100644
--- a/Source/core/inspector/InspectorStyleSheet.h
+++ b/Source/core/inspector/InspectorStyleSheet.h
@@ -52,7 +52,7 @@ class InspectorPageAgent;
class InspectorResourceAgent;
class InspectorStyleSheetBase;
-typedef WillBePersistentHeapVector<RefPtrWillBeMember<CSSRule> > CSSRuleVector;
+typedef WillBeHeapVector<RefPtrWillBeMember<CSSRule> > CSSRuleVector;
typedef String ErrorString;
class InspectorCSSId {
@@ -140,7 +140,7 @@ private:
mutable bool m_formatAcquired;
};
-class InspectorStyleSheetBase : public RefCounted<InspectorStyleSheetBase> {
+class InspectorStyleSheetBase : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyleSheetBase> {
public:
class Listener {
public:
@@ -151,6 +151,7 @@ public:
virtual void didReparseStyleSheet() = 0;
};
virtual ~InspectorStyleSheetBase() { }
+ virtual void trace(Visitor*) { }
String id() const { return m_id; }
@@ -192,9 +193,10 @@ private:
class InspectorStyleSheet : public InspectorStyleSheetBase {
public:
- static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
+ static PassRefPtrWillBeRawPtr<InspectorStyleSheet> create(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
virtual ~InspectorStyleSheet();
+ virtual void trace(Visitor*) OVERRIDE;
String finalURL() const;
virtual Document* ownerDocument() const OVERRIDE;
@@ -252,9 +254,9 @@ private:
void updateText(const String& newText);
Element* ownerStyleElement() const;
- InspectorPageAgent* m_pageAgent;
- InspectorResourceAgent* m_resourceAgent;
- RefPtrWillBePersistent<CSSStyleSheet> m_pageStyleSheet;
+ RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
+ RawPtrWillBeMember<InspectorResourceAgent> m_resourceAgent;
+ RefPtrWillBeMember<CSSStyleSheet> m_pageStyleSheet;
TypeBuilder::CSS::StyleSheetOrigin::Enum m_origin;
String m_documentURL;
OwnPtr<ParsedStyleSheet> m_parsedStyleSheet;
@@ -264,7 +266,7 @@ private:
class InspectorStyleSheetForInlineStyle FINAL : public InspectorStyleSheetBase {
public:
- static PassRefPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*);
+ static PassRefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*);
void didModifyElementAttribute();
virtual Document* ownerDocument() const OVERRIDE;
@@ -275,6 +277,8 @@ public:
virtual InspectorCSSId styleId(CSSStyleDeclaration* style) const OVERRIDE { return InspectorCSSId(id(), 0); }
virtual bool setStyleText(const InspectorCSSId&, const String&) OVERRIDE;
+ virtual void trace(Visitor*) OVERRIDE;
+
protected:
virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) OVERRIDE;
virtual unsigned ruleCount() OVERRIDE { return 1; }
@@ -289,8 +293,8 @@ private:
const String& elementStyleText() const;
PassRefPtrWillBeRawPtr<CSSRuleSourceData> getStyleAttributeData() const;
- RefPtrWillBePersistent<Element> m_element;
- RefPtrWillBePersistent<CSSRuleSourceData> m_ruleSourceData;
+ RefPtrWillBeMember<Element> m_element;
+ RefPtrWillBeMember<CSSRuleSourceData> m_ruleSourceData;
RefPtr<InspectorStyle> m_inspectorStyle;
// Contains "style" attribute value.
« no previous file with comments | « Source/core/inspector/InspectorState.cpp ('k') | Source/core/inspector/InspectorStyleSheet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698