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

Source/core/inspector/InspectorStyleSheet.h

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 83 matching lines @@
             .setStyleSheetId(m_styleSheetId)
             .setOrdinal(m_ordinal);
         return result.release();
     }
 
 private:
     String m_styleSheetId;
     unsigned m_ordinal;
 };
 
 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)
     {
     }
 
     InspectorStyleProperty(CSSPropertySourceData sourceData, bool hasSource)
         : sourceData(sourceData)
         , hasSource(hasSource)
     {
     }
 
     void setRawTextFromStyleDeclaration(const String& styleDeclaration)
     {
         unsigned start = sourceData.range.start;
         unsigned end = sourceData.range.end;
         ASSERT(start < end);
         ASSERT(end <= styleDeclaration.length());
         rawText = styleDeclaration.substring(start, end - start);
     }
 
     bool hasRawText() const { return !rawText.isEmpty(); }
 
+    void trace(Visitor* visitor) { visitor->trace(sourceData); }
+
     CSSPropertySourceData sourceData;
     bool hasSource;
     String rawText;
 };
 
 class InspectorStyle FINAL : public RefCounted<InspectorStyle> {
 public:
     static PassRefPtr<InspectorStyle> create(const InspectorCSSId&, PassRefPtr<CSSStyleDeclaration>, InspectorStyleSheetBase* parentStyleSheet);
 
     CSSStyleDeclaration* cssStyle() const { return m_style.get(); }
     PassRefPtr<TypeBuilder::CSS::CSSStyle> buildObjectForStyle() const;
     PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSComputedStyleProperty> > buildArrayForComputedStyle() const;
     bool setPropertyText(unsigned index, const String& text, bool overwrite, ExceptionState&);
     bool styleText(String* result) const;
 
 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;
     inline Document* ownerDocument() const;
 
     InspectorCSSId m_styleId;
     RefPtr<CSSStyleDeclaration> m_style;
     InspectorStyleSheetBase* m_parentStyleSheet;
     mutable std::pair<String, String> m_format;
     mutable bool m_formatAcquired;
@@ skipping 29 matching lines @@
 protected:
     InspectorStyleSheetBase(const String& id, Listener*);
 
     Listener* listener() const { return m_listener; }
     void fireStyleSheetChanged();
     PassOwnPtr<Vector<unsigned> > lineEndings();
 
     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:
     friend class InspectorStyle;
 
     String m_id;
     Listener* m_listener;
 };
 
 class InspectorStyleSheet : public InspectorStyleSheetBase {
@@ skipping 22 matching lines @@
     CSSStyleRule* ruleForId(const InspectorCSSId&) const;
 
     virtual InspectorCSSId styleId(CSSStyleDeclaration*) const OVERRIDE;
     virtual CSSStyleDeclaration* styleForId(const InspectorCSSId&) const OVERRIDE;
     virtual bool setStyleText(const InspectorCSSId&, const String&) OVERRIDE;
 
 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:
     InspectorStyleSheet(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
 
     unsigned ruleIndexByStyle(CSSStyleDeclaration*) const;
     String sourceMapURL() const;
     String sourceURL() const;
     bool ensureText() const;
     void ensureFlatRules() const;
@@ skipping 28 matching lines @@
 
     virtual CSSStyleDeclaration* styleForId(const InspectorCSSId& id) const OVERRIDE { ASSERT_UNUSED(id, !id.ordinal()); return inlineStyle(); }
     virtual InspectorCSSId styleId(CSSStyleDeclaration* style) const OVERRIDE { return InspectorCSSId(id(), 0); }
     virtual bool setStyleText(const InspectorCSSId&, const String&) OVERRIDE;
 
 protected:
     virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) OVERRIDE;
 
     // 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.
     mutable String m_styleText;
     mutable bool m_isStyleTextValid;
 };
 
 
 } // namespace WebCore
 
 #endif // !defined(InspectorStyleSheet_h)