Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: Source/core/css/CSSStyleRule.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/css/CSSSegmentedFontFace.h ('k') | Source/core/css/CSSStyleSheet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2006, 2008, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2006, 2008, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 13 matching lines...) Expand all
24 24
25 #include "core/css/CSSRule.h" 25 #include "core/css/CSSRule.h"
26 #include "platform/heap/Handle.h" 26 #include "platform/heap/Handle.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 class CSSStyleDeclaration; 30 class CSSStyleDeclaration;
31 class StyleRuleCSSStyleDeclaration; 31 class StyleRuleCSSStyleDeclaration;
32 class StyleRule; 32 class StyleRule;
33 33
34 class CSSStyleRule FINAL : public CSSRule { 34 class CSSStyleRule final : public CSSRule {
35 public: 35 public:
36 static PassRefPtrWillBeRawPtr<CSSStyleRule> create(StyleRule* rule, CSSStyle Sheet* sheet) 36 static PassRefPtrWillBeRawPtr<CSSStyleRule> create(StyleRule* rule, CSSStyle Sheet* sheet)
37 { 37 {
38 return adoptRefWillBeNoop(new CSSStyleRule(rule, sheet)); 38 return adoptRefWillBeNoop(new CSSStyleRule(rule, sheet));
39 } 39 }
40 40
41 virtual ~CSSStyleRule(); 41 virtual ~CSSStyleRule();
42 42
43 virtual CSSRule::Type type() const OVERRIDE { return STYLE_RULE; } 43 virtual CSSRule::Type type() const override { return STYLE_RULE; }
44 virtual String cssText() const OVERRIDE; 44 virtual String cssText() const override;
45 virtual void reattach(StyleRuleBase*) OVERRIDE; 45 virtual void reattach(StyleRuleBase*) override;
46 46
47 String selectorText() const; 47 String selectorText() const;
48 void setSelectorText(const String&); 48 void setSelectorText(const String&);
49 49
50 CSSStyleDeclaration* style() const; 50 CSSStyleDeclaration* style() const;
51 51
52 // FIXME: Not CSSOM. Remove. 52 // FIXME: Not CSSOM. Remove.
53 StyleRule* styleRule() const { return m_styleRule.get(); } 53 StyleRule* styleRule() const { return m_styleRule.get(); }
54 54
55 virtual void trace(Visitor*) OVERRIDE; 55 virtual void trace(Visitor*) override;
56 56
57 private: 57 private:
58 CSSStyleRule(StyleRule*, CSSStyleSheet*); 58 CSSStyleRule(StyleRule*, CSSStyleSheet*);
59 59
60 String generateSelectorText() const; 60 String generateSelectorText() const;
61 61
62 RefPtrWillBeMember<StyleRule> m_styleRule; 62 RefPtrWillBeMember<StyleRule> m_styleRule;
63 mutable RefPtrWillBeMember<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWr apper; 63 mutable RefPtrWillBeMember<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWr apper;
64 }; 64 };
65 65
66 DEFINE_CSS_RULE_TYPE_CASTS(CSSStyleRule, STYLE_RULE); 66 DEFINE_CSS_RULE_TYPE_CASTS(CSSStyleRule, STYLE_RULE);
67 67
68 } // namespace blink 68 } // namespace blink
69 69
70 #endif // CSSStyleRule_h 70 #endif // CSSStyleRule_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSSegmentedFontFace.h ('k') | Source/core/css/CSSStyleSheet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698