[Oilpan]: Move CSSPropertySourceData, InspectorStyleProperty, CSSStyleSourceData, and CSSRuleSource…

Source/core/inspector/InspectorStyleSheet.h

Index: Source/core/inspector/InspectorStyleSheet.h
diff --git a/Source/core/inspector/InspectorStyleSheet.h b/Source/core/inspector/InspectorStyleSheet.h
index 859a66a17ad7d19a1bd0cf2151c472b3fb11d164..305488612469b68725dedb8533f80026f79e72a7 100644
--- a/Source/core/inspector/InspectorStyleSheet.h
+++ b/Source/core/inspector/InspectorStyleSheet.h
@@ -102,6 +102,8 @@ private:
 };
 
 struct InspectorStyleProperty {

[haraken, 2014/03/28 14:15:00]

Again, I want to understand why we don't need to add a VectorTrait for this. In
my understanding, a VectorTrait is not for optimization but is needed to avoid
InspectorStyleProperty's destructors from being called multiple times.

Erik would know better.

[wibling-chromium, 2014/03/31 09:38:28]

I will let Erik answer this, but it should be a pure optimization AFAIK.

[Erik Corry, 2014/03/31 09:55:53]

It's not really a correctness issue (not having the trait will not cause
incorrect code), it's a compilability issue (not having the trait should cause a
compile time assert).  I can't work out why we don't need the trait here, we may
have accidentally disabled a compile time assert (we will look into it after
lunch).

In this case the struct is initializable with memset and calling a destructor on
memsetted memory is safe (the strings have refptrs in them and it's OK to
destruct a null refptr).

+    ALLOW_ONLY_INLINE_ALLOCATION();
+public:
     explicit InspectorStyleProperty(CSSPropertySourceData sourceData)
         : sourceData(sourceData)
         , hasSource(true)
@@ -125,6 +127,8 @@ struct InspectorStyleProperty {
 
     bool hasRawText() const { return !rawText.isEmpty(); }
 
+    void trace(Visitor* visitor) { visitor->trace(sourceData); }
+
     CSSPropertySourceData sourceData;
     bool hasSource;
     String rawText;
@@ -144,9 +148,9 @@ private:
     InspectorStyle(const InspectorCSSId&, PassRefPtr<CSSStyleDeclaration>, InspectorStyleSheetBase* parentStyleSheet);
 
     bool verifyPropertyText(const String& propertyText, bool canOmitSemicolon);
-    void populateAllProperties(Vector<InspectorStyleProperty>& result) const;
+    void populateAllProperties(WillBeHeapVector<InspectorStyleProperty>& result) const;
     PassRefPtr<TypeBuilder::CSS::CSSStyle> styleWithProperties() const;
-    PassRefPtr<CSSRuleSourceData> extractSourceData() const;
+    PassRefPtrWillBeRawPtr<CSSRuleSourceData> extractSourceData() const;
     bool applyStyleText(const String&);
     String shorthandValue(const String& shorthandProperty) const;
     NewLineAndWhitespace& newLineAndWhitespaceDelimiters() const;
@@ -196,7 +200,7 @@ protected:
     virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) = 0;
 
     // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration*) const = 0;
+    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration*) const = 0;
     virtual bool ensureParsedDataReady() = 0;
 
 private:
@@ -239,7 +243,7 @@ protected:
     virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) OVERRIDE;
 
     // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration*) const OVERRIDE;
+    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration*) const OVERRIDE;
     virtual bool ensureParsedDataReady() OVERRIDE;
 
 private:
@@ -288,16 +292,16 @@ protected:
 
     // Also accessed by friend class InspectorStyle.
     virtual bool ensureParsedDataReady() OVERRIDE;
-    virtual PassRefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const OVERRIDE { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
+    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const OVERRIDE { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
 
 private:
     InspectorStyleSheetForInlineStyle(const String& id, PassRefPtr<Element>, Listener*);
     CSSStyleDeclaration* inlineStyle() const;
     const String& elementStyleText() const;
-    PassRefPtr<CSSRuleSourceData> getStyleAttributeData() const;
+    PassRefPtrWillBeRawPtr<CSSRuleSourceData> getStyleAttributeData() const;
 
     RefPtr<Element> m_element;
-    RefPtr<CSSRuleSourceData> m_ruleSourceData;
+    RefPtrWillBePersistent<CSSRuleSourceData> m_ruleSourceData;
     RefPtr<InspectorStyle> m_inspectorStyle;
 
     // Contains "style" attribute value.