| Index: Source/core/inspector/InspectorStyleSheet.h
|
| diff --git a/Source/core/inspector/InspectorStyleSheet.h b/Source/core/inspector/InspectorStyleSheet.h
|
| index 1e96d3ba2944c89e8e10d50216917390c763ad85..e73a6d672ddb6b8c36e4cc0d254057a86bd0911f 100644
|
| --- a/Source/core/inspector/InspectorStyleSheet.h
|
| +++ b/Source/core/inspector/InspectorStyleSheet.h
|
| @@ -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);
|
|
|
| @@ -191,12 +191,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&);
|
| @@ -213,21 +213,21 @@ public:
|
| 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*);
|
| @@ -264,28 +264,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*);
|
|
|