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..7631277275ab900fdbea2ee8bc085a1fa5c517b5 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,15 @@ 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;
 };
 
@@ -138,11 +113,10 @@ protected:
     void onStyleSheetTextChanged();
     const LineEndings* lineEndings();
 
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleAt(unsigned ruleIndex) = 0;
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) = 0;
     virtual unsigned ruleCount() = 0;
 
     // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned) const = 0;
     virtual bool ensureParsedDataReady() = 0;
 
 private:
@@ -188,11 +162,10 @@ public:
     const CSSRuleVector& flatRules();
 
 protected:
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleAt(unsigned ruleIndex) override;
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) override;
     virtual unsigned ruleCount() override;
 
     // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned) const override;
     virtual bool ensureParsedDataReady() override;
 
 private:
@@ -246,32 +219,23 @@ public:
     DECLARE_VIRTUAL_TRACE();
 
 protected:
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleAt(unsigned ruleIndex) override;
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyle(RefPtrWillBeRawPtr<CSSStyleDeclaration>) override;
     virtual unsigned ruleCount() override { return 1; }
 
     // 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)