Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / InspectorStyleSheet.h

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h b/src/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
index 5cf1bed..03f24a9 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.h
@@ -42,7 +42,6 @@ class ParsedStyleSheet;
 namespace blink {
 
 class CSSMediaRule;
-class CSSRuleList;
 class CSSStyleDeclaration;
 class CSSStyleRule;
 class CSSStyleSheet;
@@ -55,6 +54,7 @@ class InspectorStyleSheetBase;
 
 typedef WillBeHeapVector<RefPtrWillBeMember<CSSRule> > CSSRuleVector;
 typedef String ErrorString;
+typedef Vector<unsigned> LineEndings;
 
 class InspectorCSSId {
 public:
@@ -103,7 +103,7 @@ public:
     String rawText;
 };
 
-class InspectorStyle FINAL : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyle> {
+class InspectorStyle final : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyle> {
 public:
     static PassRefPtrWillBeRawPtr<InspectorStyle> create(const InspectorCSSId&, PassRefPtrWillBeRawPtr<CSSStyleDeclaration>, InspectorStyleSheetBase* parentStyleSheet);
 
@@ -169,8 +169,8 @@ protected:
     InspectorStyleSheetBase(const String& id, Listener*);
 
     Listener* listener() const { return m_listener; }
-    void fireStyleSheetChanged();
-    PassOwnPtr<Vector<unsigned> > lineEndings();
+    void onStyleSheetTextChanged();
+    const LineEndings* lineEndings();
 
     virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) = 0;
     virtual unsigned ruleCount() = 0;
@@ -184,6 +184,7 @@ private:
 
     String m_id;
     Listener* m_listener;
+    OwnPtr<LineEndings> m_lineEndings;
 };
 
 class InspectorStyleSheet : public InspectorStyleSheetBase {
@@ -191,12 +192,12 @@ public:
     static PassRefPtrWillBeRawPtr<InspectorStyleSheet> create(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
 
     virtual ~InspectorStyleSheet();
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
     String finalURL() const;
-    virtual Document* ownerDocument() const OVERRIDE;
-    virtual bool setText(const String&, ExceptionState&) OVERRIDE;
-    virtual bool getText(String* result) const OVERRIDE;
+    virtual Document* ownerDocument() const override;
+    virtual bool setText(const String&, ExceptionState&) override;
+    virtual bool getText(String* result) const override;
     String ruleSelector(const InspectorCSSId&, ExceptionState&);
     bool setRuleSelector(const InspectorCSSId&, const String& selector, ExceptionState&);
     CSSStyleRule* addRule(const String& ruleText, const SourceRange& location, ExceptionState&);
@@ -208,25 +209,26 @@ public:
     PassRefPtr<TypeBuilder::CSS::CSSRule> buildObjectForRule(CSSStyleRule*, PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSMedia> >);
 
     PassRefPtr<TypeBuilder::CSS::SourceRange> ruleHeaderSourceRange(const CSSRule*);
+    PassRefPtr<TypeBuilder::CSS::SourceRange> mediaQueryExpValueSourceRange(const CSSRule*, size_t mediaQueryIndex, size_t mediaQueryExpIndex);
 
     InspectorCSSId ruleId(CSSStyleRule*) const;
     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;
+    virtual InspectorCSSId styleId(CSSStyleDeclaration*) const override;
+    virtual CSSStyleDeclaration* styleForId(const InspectorCSSId&) const override;
+    virtual bool setStyleText(const InspectorCSSId&, const String&) override;
 
     bool findRuleBySelectorRange(const SourceRange&, InspectorCSSId*);
 
     const CSSRuleVector& flatRules();
 
 protected:
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) OVERRIDE;
-    virtual unsigned ruleCount() OVERRIDE;
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) override;
+    virtual unsigned ruleCount() override;
 
     // Also accessed by friend class InspectorStyle.
-    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned) const OVERRIDE;
-    virtual bool ensureParsedDataReady() OVERRIDE;
+    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned) const override;
+    virtual bool ensureParsedDataReady() override;
 
 private:
     InspectorStyleSheet(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*);
@@ -263,28 +265,28 @@ private:
     mutable String m_sourceURL;
 };
 
-class InspectorStyleSheetForInlineStyle FINAL : public InspectorStyleSheetBase {
+class InspectorStyleSheetForInlineStyle final : public InspectorStyleSheetBase {
 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 Document* ownerDocument() const override;
+    virtual bool setText(const String&, ExceptionState&) override;
+    virtual bool getText(String* result) const override;
 
-    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;
+    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;
 
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
 protected:
-    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) OVERRIDE;
-    virtual unsigned ruleCount() OVERRIDE { return 1; }
+    virtual PassRefPtrWillBeRawPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) 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; }
+    virtual bool ensureParsedDataReady() override;
+    virtual PassRefPtrWillBeRawPtr<CSSRuleSourceData> ruleSourceDataAt(unsigned ruleIndex) const override { ASSERT_UNUSED(ruleIndex, !ruleIndex); return m_ruleSourceData; }
 
 private:
     InspectorStyleSheetForInlineStyle(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*);