DevTools: cleanup InspectorStyleSheet

DevTools: cleanup InspectorStyleSheet

This patch cleans up InspectorStyleSheet after the InspectorStyleSheet
and InspectorStyleSheetForInlineStyle implementations were separated.
It does the following changes:
- remove InspectorStyleSheet.checkPageStyleSheet as it is never used
- inline InspectorStyleSheet.ruleIndexByRule
- inline method InspectorStyleSheet.ruleIdByStyle into InspectorStyleSheet.styleId
- introduce single implementation for lineEndings in InspectorStyleSheetBase
- eliminate method InspectorStyleSheetBase.reparsestyleSheet

BUG=341506
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169574

[lushnikov, 2014-03-18 17:43:18]

Please, take a look

[vsevik, 2014-03-19 08:26:52]

lgtm

https://codereview.chromium.org/203633003/diff/1/Source/core/inspector/Inspec...
File Source/core/inspector/InspectorStyleSheet.cpp (right):

https://codereview.chromium.org/203633003/diff/1/Source/core/inspector/Inspec...
Source/core/inspector/InspectorStyleSheet.cpp:1502:
exceptionState.throwDOMException(SyntaxError, "Style sheet text is invalid.");
This could be moved out to agent.

[lushnikov, 2014-03-19 08:57:37]

Thank you for the review

https://codereview.chromium.org/203633003/diff/1/Source/core/inspector/Inspec...
File Source/core/inspector/InspectorStyleSheet.cpp (right):

https://codereview.chromium.org/203633003/diff/1/Source/core/inspector/Inspec...
Source/core/inspector/InspectorStyleSheet.cpp:1502:
exceptionState.throwDOMException(SyntaxError, "Style sheet text is invalid.");
On 2014/03/19 08:26:53, vsevik wrote:
> This could be moved out to agent.

Discussed offline, decided to leave it as-is

[lushnikov, 2014-03-19 14:47:01]

The CQ bit was checked by lushnikov@chromium.org

[commit-bot: I haz the power, 2014-03-19 14:47:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lushnikov@chromium.org/203633003/20001

[commit-bot: I haz the power, 2014-03-19 14:50:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-19 14:50:59]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[lushnikov, 2014-03-19 14:59:56]

The CQ bit was checked by lushnikov@chromium.org

[commit-bot: I haz the power, 2014-03-19 14:59:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lushnikov@chromium.org/203633003/20001

[commit-bot: I haz the power, 2014-03-19 16:04:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-19 16:04:50]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[lushnikov, 2014-03-19 16:35:01]

The CQ bit was checked by lushnikov@chromium.org

[commit-bot: I haz the power, 2014-03-19 16:35:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lushnikov@chromium.org/203633003/20001

[commit-bot: I haz the power, 2014-03-19 16:35:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-19 16:35:13]

Failed to apply patch for Source/core/inspector/InspectorStyleSheet.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/inspector/InspectorStyleSheet.h
  Hunk #5 FAILED at 238.
  1 out of 7 hunks FAILED -- saving rejects to file
Source/core/inspector/InspectorStyleSheet.h.rej

Patch:       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
233cefd6c07a9b1d4ca2d49277586a3742a7e924..a74f658e9c9d278ba0da86f62c323a2081fa878a
100644
--- a/Source/core/inspector/InspectorStyleSheet.h
+++ b/Source/core/inspector/InspectorStyleSheet.h
@@ -176,7 +176,6 @@ public:
     virtual Document* ownerDocument() const = 0;
     virtual bool setText(const String&, ExceptionState&) = 0;
     virtual bool getText(String* result) const = 0;
-    virtual void reparseStyleSheet(const String&) = 0;
     bool setPropertyText(const InspectorCSSId&, unsigned propertyIndex, const
String& text, bool overwrite, String* oldPropertyText, ExceptionState&);
 
     virtual CSSStyleDeclaration* styleForId(const InspectorCSSId&) const = 0;
@@ -189,13 +188,13 @@ protected:
 
     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 bool setStyleText(CSSStyleDeclaration*, const String&) = 0;
-    virtual PassOwnPtr<Vector<unsigned> > lineEndings() const = 0;
     virtual bool ensureParsedDataReady() = 0;
 
 private:
@@ -213,7 +212,6 @@ public:
 
     String finalURL() const;
     virtual Document* ownerDocument() const OVERRIDE;
-    virtual void reparseStyleSheet(const String&) OVERRIDE;
     virtual bool setText(const String&, ExceptionState&) OVERRIDE;
     virtual bool getText(String* result) const OVERRIDE;
     String ruleSelector(const InspectorCSSId&, ExceptionState&);
@@ -231,7 +229,7 @@ public:
     InspectorCSSId ruleId(CSSStyleRule*) const;
     CSSStyleRule* ruleForId(const InspectorCSSId&) const;
 
-    virtual InspectorCSSId styleId(CSSStyleDeclaration* style) const OVERRIDE {
return ruleIdByStyle(style); }
+    virtual InspectorCSSId styleId(CSSStyleDeclaration*) const OVERRIDE;
     virtual CSSStyleDeclaration* styleForId(const InspectorCSSId&) const
OVERRIDE;
 
 protected:
@@ -240,25 +238,21 @@ protected:
     // Also accessed by friend class InspectorStyle.
     virtual PassRefPtr<CSSRuleSourceData>
ruleSourceDataFor(CSSStyleDeclaration*) const OVERRIDE;
     virtual bool setStyleText(CSSStyleDeclaration*, const String&) OVERRIDE;
-    virtual PassOwnPtr<Vector<unsigned> > lineEndings() const OVERRIDE;
     virtual bool ensureParsedDataReady() OVERRIDE;
 
 private:
     InspectorStyleSheet(InspectorPageAgent*, InspectorResourceAgent*, const
String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet,
TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
 
-    InspectorCSSId ruleIdByStyle(CSSStyleDeclaration*) const;
     unsigned ruleIndexByStyle(CSSStyleDeclaration*) const;
-    unsigned ruleIndexByRule(const CSSRule*) const;
     String sourceMapURL() const;
     String sourceURL() const;
-    bool checkPageStyleSheet(ExceptionState&) const;
     bool ensureText() const;
     void ensureFlatRules() const;
     bool styleSheetTextWithChangedStyle(CSSStyleDeclaration*, const String&
newStyleText, String* result);
     bool originalStyleSheetText(String* result) const;
     bool resourceStyleSheetText(String* result) const;
     bool inlineStyleSheetText(String* result) const;
-    PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector> >
selectorsFromSource(const CSSRuleSourceData*, const String&) const;
+    PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::Selector> >
selectorsFromSource(const CSSRuleSourceData*, const String&);
     PassRefPtr<TypeBuilder::CSS::SelectorList>
buildObjectForSelectorList(CSSStyleRule*);
     String url() const;
     bool hasSourceURL() const;
@@ -280,7 +274,6 @@ public:
 
     void didModifyElementAttribute();
     virtual Document* ownerDocument() const OVERRIDE;
-    virtual void reparseStyleSheet(const String&) OVERRIDE;
     virtual bool setText(const String&, ExceptionState&) OVERRIDE;
     virtual bool getText(String* result) const OVERRIDE;
 
@@ -294,7 +287,6 @@ protected:
     virtual bool ensureParsedDataReady() OVERRIDE;
     virtual PassRefPtr<CSSRuleSourceData>
ruleSourceDataFor(CSSStyleDeclaration* style) const OVERRIDE {
ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
     virtual bool setStyleText(CSSStyleDeclaration*, const String&) OVERRIDE;
-    virtual PassOwnPtr<Vector<unsigned> > lineEndings() const OVERRIDE;
 
 private:
     InspectorStyleSheetForInlineStyle(const String& id, PassRefPtr<Element>,
Listener*);

[lushnikov, 2014-03-19 18:11:57]

The CQ bit was checked by lushnikov@chromium.org

[commit-bot: I haz the power, 2014-03-19 18:12:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lushnikov@chromium.org/203633003/40001

[commit-bot: I haz the power, 2014-03-19 19:20:54]

Change committed as 169574