DevTools: migrate inspector's ParsedStyleSheet to Oilpan.

Source/core/inspector/InspectorStyleSheet.cpp

 /*
  * 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 317 matching lines @@
     m_currentRuleDataStack.last()->mediaSourceData->queryData.append(data);
 }
 
 void StyleSheetHandler::endMediaQuery()
 {
     m_currentMediaQueryData.clear();
 }
 
 } // namespace
 
-class ParsedStyleSheet {
-    WTF_MAKE_FAST_ALLOCATED(ParsedStyleSheet);
+class ParsedStyleSheet : public RefCountedWillBeGarbageCollectedFinalized<ParsedStyleSheet> {
 public:
     ParsedStyleSheet(CSSStyleSheet* pageStyleSheet);
 
     const String& text() const { ASSERT(m_hasText); return m_text; }
     void setText(const String&);
     bool hasText() const { return m_hasText; }
     bool ensureSourceData();
     bool hasSourceData() const { return m_sourceData; }
     PassRefPtrWillBeRawPtr<blink::CSSRuleSourceData> ruleSourceDataAt(unsigned) const;
     unsigned ruleCount() { return m_sourceData->size(); }
 
+    DECLARE_TRACE();
+
 private:
     void flattenSourceData(RuleSourceDataList*);
     void setSourceData(PassOwnPtrWillBeRawPtr<RuleSourceDataList>);
 
     String m_text;
     bool m_hasText;
-    OwnPtrWillBePersistent<RuleSourceDataList> m_sourceData;
-    RefPtrWillBePersistent<CSSStyleSheet> m_pageStyleSheet;
+    OwnPtrWillBeMember<RuleSourceDataList> m_sourceData;
+    RefPtrWillBeMember<CSSStyleSheet> m_pageStyleSheet;
 };
 
 ParsedStyleSheet::ParsedStyleSheet(CSSStyleSheet* pageStyleSheet)
     : m_hasText(false)
     , m_pageStyleSheet(pageStyleSheet)
 {
 }
 
 void ParsedStyleSheet::setText(const String& text)
 {
@@ skipping 58 matching lines @@
 }
 
 PassRefPtrWillBeRawPtr<blink::CSSRuleSourceData> ParsedStyleSheet::ruleSourceDataAt(unsigned index) const
 {
     if (!hasSourceData() || index >= m_sourceData->size())
         return nullptr;
 
     return m_sourceData->at(index);
 }
 
+DEFINE_TRACE(ParsedStyleSheet)
+{
+    visitor->trace(m_sourceData);
+    visitor->trace(m_pageStyleSheet);
+}
+
 namespace blink {
 
 enum MediaListSource {
     MediaListSourceLinkedSheet,
     MediaListSourceInlineSheet,
     MediaListSourceMediaRule,
     MediaListSourceImportRule
 };
 
 static PassRefPtr<TypeBuilder::CSS::SourceRange> buildSourceRangeObject(const SourceRange& range, const LineEndings* lineEndings)
@@ skipping 482 matching lines @@
 }
 
 InspectorStyleSheet::InspectorStyleSheet(InspectorResourceAgent* resourceAgent, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, InspectorCSSAgent* cssAgent)
     : InspectorStyleSheetBase(id, cssAgent)
     , m_cssAgent(cssAgent)
     , m_resourceAgent(resourceAgent)
     , m_pageStyleSheet(pageStyleSheet)
     , m_origin(origin)
     , m_documentURL(documentURL)
 {
-    m_parsedStyleSheet = adoptPtr(new ParsedStyleSheet(m_pageStyleSheet.get()));

[yurys, 2015/06/15 08:21:56]

Why was it removed? It should have become adoptPtr(...).leakPtr(); if you need a
raw pointer.

+    m_parsedStyleSheet = new ParsedStyleSheet(m_pageStyleSheet.get());
 }
 
 InspectorStyleSheet::~InspectorStyleSheet()
 {
 }
 
 DEFINE_TRACE(InspectorStyleSheet)
 {
     visitor->trace(m_cssAgent);
     visitor->trace(m_resourceAgent);
     visitor->trace(m_pageStyleSheet);
+    visitor->trace(m_parsedStyleSheet);
     visitor->trace(m_flatRules);
     InspectorStyleSheetBase::trace(visitor);
 }
 
 static String styleSheetURL(CSSStyleSheet* pageStyleSheet)
 {
     if (pageStyleSheet && !pageStyleSheet->contents()->baseURL().isEmpty())
         return pageStyleSheet->contents()->baseURL().string();
     return emptyString();
 }
 
 String InspectorStyleSheet::finalURL() const
 {
     String url = styleSheetURL(m_pageStyleSheet.get());
     return url.isEmpty() ? m_documentURL : url;
 }
 
 bool InspectorStyleSheet::setText(const String& text, ExceptionState& exceptionState)
 {
     updateText(text);
-    m_flatRules.clear();
 
     if (listener())
         listener()->willReparseStyleSheet();
 
     {
         // Have a separate scope for clearRules() (bug 95324).
         CSSStyleSheet::RuleMutationScope mutationScope(m_pageStyleSheet.get());
         m_pageStyleSheet->contents()->clearRules();
         m_pageStyleSheet->clearChildRuleCSSOMWrappers();
     }
@@ skipping 269 matching lines @@
     }
 
     ensureFlatRules();
     CSSStyleRule* styleRule = insertCSSOMRuleBySourceRange(location, ruleText, exceptionState);
     if (exceptionState.hadException())
         return nullptr;
 
     text.insert(ruleText, location.start);
 
     updateText(text);
-    m_flatRules.clear();
 
     onStyleSheetTextChanged();
     return styleRule;
 }
 
 bool InspectorStyleSheet::deleteRule(unsigned ruleIndex, const String& oldText, ExceptionState& exceptionState)
 {
     RefPtrWillBeRawPtr<CSSStyleRule> rule = ruleAt(ruleIndex);
     if (!rule) {
         exceptionState.throwDOMException(NotFoundError, "No style rule could be found for the provided ID.");
@@ skipping 29 matching lines @@
             ++index;
         ASSERT(index < styleSheet->length());
         styleSheet->deleteRule(index, exceptionState);
     }
     // |rule| MAY NOT be addressed after this line!
 
     if (exceptionState.hadException())
         return false;
 
     updateText(oldText);
-    m_flatRules.clear();
     onStyleSheetTextChanged();
     return true;
 }
 
 void InspectorStyleSheet::updateText(const String& newText)
 {
     Element* element = ownerStyleElement();
     if (element)
         m_cssAgent->addEditedStyleElement(DOMNodeIds::idForNode(element), newText);
     else
         m_cssAgent->addEditedStyleSheet(finalURL(), newText);
     m_parsedStyleSheet->setText(newText);
+    m_flatRules.clear();

[lushnikov, 2015/06/15 12:21:36]

this is wrong - updateText is called from way more places then we need to clear
flat rules.

 }
 
 CSSStyleRule* InspectorStyleSheet::ruleAt(unsigned ruleIndex) const
 {
     ensureFlatRules();
     return InspectorCSSAgent::asCSSStyleRule(ruleIndex >= m_flatRules.size() ? nullptr : m_flatRules.at(ruleIndex).get());
 }
 
 CSSMediaRule* InspectorStyleSheet::mediaRuleAt(unsigned ruleIndex) const
 {
@@ skipping 589 matching lines @@
 
 DEFINE_TRACE(InspectorStyleSheetForInlineStyle)
 {
     visitor->trace(m_element);
     visitor->trace(m_ruleSourceData);
     visitor->trace(m_inspectorStyle);
     InspectorStyleSheetBase::trace(visitor);
 }
 
 } // namespace blink