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

Side by Side Diff: Source/core/css/CSSKeyframeRule.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/CSSImportRule.h ('k') | Source/core/css/CSSKeyframesRule.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 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class CSSKeyframesRule; 33 class CSSKeyframesRule;
34 class CSSParserValueList; 34 class CSSParserValueList;
35 class CSSStyleDeclaration; 35 class CSSStyleDeclaration;
36 class MutableStylePropertySet; 36 class MutableStylePropertySet;
37 class StylePropertySet; 37 class StylePropertySet;
38 class StyleRuleCSSStyleDeclaration; 38 class StyleRuleCSSStyleDeclaration;
39 39
40 class StyleKeyframe FINAL : public RefCountedWillBeGarbageCollectedFinalized<Sty leKeyframe> { 40 class StyleKeyframe final : public RefCountedWillBeGarbageCollectedFinalized<Sty leKeyframe> {
41 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; 41 WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
42 public: 42 public:
43 static PassRefPtrWillBeRawPtr<StyleKeyframe> create() 43 static PassRefPtrWillBeRawPtr<StyleKeyframe> create()
44 { 44 {
45 return adoptRefWillBeNoop(new StyleKeyframe()); 45 return adoptRefWillBeNoop(new StyleKeyframe());
46 } 46 }
47 ~StyleKeyframe(); 47 ~StyleKeyframe();
48 48
49 // Exposed to JavaScript. 49 // Exposed to JavaScript.
50 String keyText() const; 50 String keyText() const;
(...skipping 16 matching lines...) Expand all
67 67
68 private: 68 private:
69 StyleKeyframe(); 69 StyleKeyframe();
70 70
71 RefPtrWillBeMember<StylePropertySet> m_properties; 71 RefPtrWillBeMember<StylePropertySet> m_properties;
72 // These are both calculated lazily. Either one can be set, which invalidate s the other. 72 // These are both calculated lazily. Either one can be set, which invalidate s the other.
73 mutable String m_keyText; 73 mutable String m_keyText;
74 mutable OwnPtr<Vector<double> > m_keys; 74 mutable OwnPtr<Vector<double> > m_keys;
75 }; 75 };
76 76
77 class CSSKeyframeRule FINAL : public CSSRule { 77 class CSSKeyframeRule final : public CSSRule {
78 public: 78 public:
79 virtual ~CSSKeyframeRule(); 79 virtual ~CSSKeyframeRule();
80 80
81 virtual CSSRule::Type type() const OVERRIDE { return KEYFRAME_RULE; } 81 virtual CSSRule::Type type() const override { return KEYFRAME_RULE; }
82 virtual String cssText() const OVERRIDE { return m_keyframe->cssText(); } 82 virtual String cssText() const override { return m_keyframe->cssText(); }
83 virtual void reattach(StyleRuleBase*) OVERRIDE; 83 virtual void reattach(StyleRuleBase*) override;
84 84
85 String keyText() const { return m_keyframe->keyText(); } 85 String keyText() const { return m_keyframe->keyText(); }
86 void setKeyText(const String& s) { m_keyframe->setKeyText(s); } 86 void setKeyText(const String& s) { m_keyframe->setKeyText(s); }
87 87
88 CSSStyleDeclaration* style() const; 88 CSSStyleDeclaration* style() const;
89 89
90 virtual void trace(Visitor*) OVERRIDE; 90 virtual void trace(Visitor*) override;
91 91
92 private: 92 private:
93 CSSKeyframeRule(StyleKeyframe*, CSSKeyframesRule* parent); 93 CSSKeyframeRule(StyleKeyframe*, CSSKeyframesRule* parent);
94 94
95 RefPtrWillBeMember<StyleKeyframe> m_keyframe; 95 RefPtrWillBeMember<StyleKeyframe> m_keyframe;
96 mutable RefPtrWillBeMember<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWr apper; 96 mutable RefPtrWillBeMember<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWr apper;
97 97
98 friend class CSSKeyframesRule; 98 friend class CSSKeyframesRule;
99 }; 99 };
100 100
101 DEFINE_CSS_RULE_TYPE_CASTS(CSSKeyframeRule, KEYFRAME_RULE); 101 DEFINE_CSS_RULE_TYPE_CASTS(CSSKeyframeRule, KEYFRAME_RULE);
102 102
103 } // namespace blink 103 } // namespace blink
104 104
105 #endif // CSSKeyframeRule_h 105 #endif // CSSKeyframeRule_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSImportRule.h ('k') | Source/core/css/CSSKeyframesRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698