DevTools: remove ruleId from the style.

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 fca65b6e3b575d7d3c5e7333bf882f5ce78d1f8f..4df012d2061acd67bf4bed6f4acea7d19593635b 100644
--- a/Source/core/inspector/InspectorStyleSheet.h
+++ b/Source/core/inspector/InspectorStyleSheet.h
@@ -55,33 +55,9 @@ typedef WillBeHeapVector<RefPtrWillBeMember<CSSRule> > CSSRuleVector;
 typedef String ErrorString;
 typedef Vector<unsigned> LineEndings;
 
-struct InspectorStyleProperty {
-    ALLOW_ONLY_INLINE_ALLOCATION();
-public:
-    explicit InspectorStyleProperty(CSSPropertySourceData sourceData)
-        : sourceData(sourceData)
-        , hasSource(true)
-    {
-    }
-
-    InspectorStyleProperty(CSSPropertySourceData sourceData, bool hasSource)
-        : sourceData(sourceData)
-        , hasSource(hasSource)
-    {
-    }
-
-    bool hasRawText() const { return !rawText.isEmpty(); }
-
-    DEFINE_INLINE_TRACE() { visitor->trace(sourceData); }
-
-    CSSPropertySourceData sourceData;
-    bool hasSource;
-    String rawText;
-};
-
 class InspectorStyle final : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyle> {
 public:
-    static PassRefPtrWillBeRawPtr<InspectorStyle> create(unsigned ruleIndex, PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, InspectorStyleSheetBase* parentStyleSheet);
+    static PassRefPtrWillBeRawPtr<InspectorStyle> create(PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, PassRefPtrWillBeRawPtr<CSSRuleSourceData>, InspectorStyleSheetBase* parentStyleSheet);
 
     CSSStyleDeclaration* cssStyle() const { return m_style.get(); }
     PassRefPtr<TypeBuilder::CSS::CSSStyle> buildObjectForStyle() const;
@@ -92,16 +68,14 @@ public:
     DECLARE_TRACE();
 
 private:
-    InspectorStyle(unsigned ruleIndex, PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, InspectorStyleSheetBase* parentStyleSheet);
+    InspectorStyle(PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, PassRefPtrWillBeRawPtr<CSSRuleSourceData>, InspectorStyleSheetBase* parentStyleSheet);
 
-    void populateAllProperties(WillBeHeapVector<InspectorStyleProperty>& result) const;
+    void populateAllProperties(WillBeHeapVector<CSSPropertySourceData>& result) const;
     PassRefPtr<TypeBuilder::CSS::CSSStyle> styleWithProperties() const;
-    PassRefPtrWillBeRawPtr<CSSRuleSourceData> extractSourceData() const;
     String shorthandValue(const String& shorthandProperty) const;
-    inline Document* ownerDocument() const;
 
-    unsigned m_ruleIndex;
     RefPtrWillBeMember<CSSStyleDeclaration> m_style;
+    RefPtrWillBeMember<CSSRuleSourceData> m_sourceData;
     RawPtrWillBeMember<InspectorStyleSheetBase> m_parentStyleSheet;
 };
 
@@ -120,13 +94,9 @@ public:
 
     String id() const { return m_id; }
 
-    virtual Document* ownerDocument() const = 0;
     virtual bool setText(const String&, ExceptionState&) = 0;
     virtual bool getText(String* result) const = 0;
 
-    virtual CSSStyleDeclaration* styleAt(unsigned ruleIndex) const = 0;
-    virtual unsigned indexOf(CSSStyleDeclaration*) const = 0;
-
     PassRefPtr<TypeBuilder::CSS::CSSStyle> buildObjectForStyle(CSSStyleDeclaration*);
     bool lineNumberAndColumnToOffset(unsigned lineNumber, unsigned columnNumber, unsigned* offset);
     virtual bool isInlineStyle() = 0;
@@ -138,12 +108,7 @@ protected:
     void onStyleSheetTextChanged();
     const LineEndings* lineEndings();
 
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleAt(unsigned ruleIndex) = 0;
-    virtual unsigned ruleCount() = 0;
-
-    // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned) const = 0;
-    virtual bool ensureParsedDataReady() = 0;
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) = 0;
 
 private:
     friend class InspectorStyle;
@@ -161,7 +126,6 @@ public:
     DECLARE_VIRTUAL_TRACE();
 
     String finalURL() const;
-    virtual Document* ownerDocument() const override;
     virtual bool setText(const String&, ExceptionState&) override;
     virtual bool getText(String* result) const override;
     RefPtrWillBeRawPtr<CSSStyleRule>  setRuleSelector(const SourceRange&, const String& selector, SourceRange* newRange, String* oldSelector, ExceptionState&);
@@ -178,22 +142,11 @@ public:
     PassRefPtr<TypeBuilder::CSS::SourceRange> ruleHeaderSourceRange(const CSSRule*);
     PassRefPtr<TypeBuilder::CSS::SourceRange> mediaQueryExpValueSourceRange(const CSSRule*, size_t mediaQueryIndex, size_t mediaQueryExpIndex);
 
-    unsigned indexOf(CSSStyleRule*) const;
-    CSSStyleRule* ruleAt(unsigned ruleIndex) const;
-    CSSMediaRule* mediaRuleAt(unsigned ruleIndex) const;
-
-    virtual unsigned indexOf(CSSStyleDeclaration*) const override;
-    virtual CSSStyleDeclaration* styleAt(unsigned ruleIndex) const override;
     bool isInlineStyle() override { return false; }
     const CSSRuleVector& flatRules();
 
 protected:
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleAt(unsigned ruleIndex) override;
-    virtual unsigned ruleCount() override;
-
-    // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned) const override;
-    virtual bool ensureParsedDataReady() override;
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) override;
 
 private:
     InspectorStyleSheet(InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, InspectorCSSAgent*);
@@ -216,6 +169,8 @@ private:
     bool hasSourceURL() const;
     bool startsAtZero() const;
 
+    unsigned indexOf(CSSStyleDeclaration*) const;
+    bool ensureParsedDataReady();
     void replaceText(const SourceRange&, const String& text, SourceRange* newRange, String* oldText);
     void innerSetText(const String& newText);
     Element* ownerStyleElement() const;
@@ -235,43 +190,28 @@ public:
     static PassRefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*);
 
     void didModifyElementAttribute();
-    virtual Document* ownerDocument() const override;
     virtual bool setText(const String&, ExceptionState&) override;
     virtual bool getText(String* result) const override;
-
-    virtual CSSStyleDeclaration* styleAt(unsigned ruleIndex) const override { ASSERT_UNUSED(ruleIndex, !ruleIndex); return inlineStyle(); }
-    virtual unsigned indexOf(CSSStyleDeclaration* style) const override { return 0; }
     CSSStyleDeclaration* inlineStyle() const;
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleAt(unsigned ruleIndex) override;
-    virtual unsigned ruleCount() override { return 1; }
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) override;
 
     // Also accessed by friend class InspectorStyle.
-    virtual bool ensureParsedDataReady() override;
-    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned ruleIndex) const override { ASSERT_UNUSED(ruleIndex, !ruleIndex); return m_ruleSourceData; }
     bool isInlineStyle() override { return true; }
 
 private:
     InspectorStyleSheetForInlineStyle(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*);
     const String& elementStyleText() const;
-    PassRefPtrWillBeRawPtr<CSSRuleSourceData> getStyleAttributeData() const;
 
     RefPtrWillBeMember<Element> m_element;
-    RefPtrWillBeMember<CSSRuleSourceData> m_ruleSourceData;
     RefPtrWillBeMember<InspectorStyle> m_inspectorStyle;
-
-    // Contains "style" attribute value.
-    mutable String m_styleText;
-    mutable bool m_isStyleTextValid;
 };
 
 
 
 } // namespace blink
 
-WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::InspectorStyleProperty);
-
 #endif // !defined(InspectorStyleSheet_h)