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

Side by Side Diff: Source/core/svg/SVGAngle.h

Issue 631153003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/svg (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/svg/SVGAltGlyphItemElement.h ('k') | Source/core/svg/SVGAngleTearOff.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) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. 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 30 matching lines...) Expand all
41 41
42 class SVGMarkerOrientEnumeration : public SVGEnumeration<SVGMarkerOrientType> { 42 class SVGMarkerOrientEnumeration : public SVGEnumeration<SVGMarkerOrientType> {
43 public: 43 public:
44 static PassRefPtr<SVGMarkerOrientEnumeration> create(SVGAngle* angle) 44 static PassRefPtr<SVGMarkerOrientEnumeration> create(SVGAngle* angle)
45 { 45 {
46 return adoptRef(new SVGMarkerOrientEnumeration(angle)); 46 return adoptRef(new SVGMarkerOrientEnumeration(angle));
47 } 47 }
48 48
49 virtual ~SVGMarkerOrientEnumeration(); 49 virtual ~SVGMarkerOrientEnumeration();
50 50
51 virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) OVERR IDE; 51 virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) overr ide;
52 virtual void calculateAnimatedValue(SVGAnimationElement*, float, unsigned, P assRefPtr<SVGPropertyBase>, PassRefPtr<SVGPropertyBase>, PassRefPtr<SVGPropertyB ase>, SVGElement*) OVERRIDE; 52 virtual void calculateAnimatedValue(SVGAnimationElement*, float, unsigned, P assRefPtr<SVGPropertyBase>, PassRefPtr<SVGPropertyBase>, PassRefPtr<SVGPropertyB ase>, SVGElement*) override;
53 virtual float calculateDistance(PassRefPtr<SVGPropertyBase>, SVGElement*) OV ERRIDE; 53 virtual float calculateDistance(PassRefPtr<SVGPropertyBase>, SVGElement*) ov erride;
54 54
55 private: 55 private:
56 SVGMarkerOrientEnumeration(SVGAngle*); 56 SVGMarkerOrientEnumeration(SVGAngle*);
57 57
58 virtual void notifyChange() OVERRIDE; 58 virtual void notifyChange() override;
59 59
60 // FIXME: oilpan: This is kept as raw-ptr to avoid reference cycles. Should be Member in oilpan. 60 // FIXME: oilpan: This is kept as raw-ptr to avoid reference cycles. Should be Member in oilpan.
61 SVGAngle* m_angle; 61 SVGAngle* m_angle;
62 }; 62 };
63 63
64 class SVGAngle : public SVGPropertyHelper<SVGAngle> { 64 class SVGAngle : public SVGPropertyHelper<SVGAngle> {
65 public: 65 public:
66 typedef SVGAngleTearOff TearOffType; 66 typedef SVGAngleTearOff TearOffType;
67 67
68 enum SVGAngleType { 68 enum SVGAngleType {
(...skipping 23 matching lines...) Expand all
92 void newValueSpecifiedUnits(SVGAngleType unitType, float valueInSpecifiedUni ts); 92 void newValueSpecifiedUnits(SVGAngleType unitType, float valueInSpecifiedUni ts);
93 void convertToSpecifiedUnits(SVGAngleType unitType, ExceptionState&); 93 void convertToSpecifiedUnits(SVGAngleType unitType, ExceptionState&);
94 94
95 SVGEnumeration<SVGMarkerOrientType>* orientType() { return m_orientType.get( ); } 95 SVGEnumeration<SVGMarkerOrientType>* orientType() { return m_orientType.get( ); }
96 void orientTypeChanged(); 96 void orientTypeChanged();
97 97
98 // SVGPropertyBase: 98 // SVGPropertyBase:
99 99
100 PassRefPtr<SVGAngle> clone() const; 100 PassRefPtr<SVGAngle> clone() const;
101 101
102 virtual String valueAsString() const OVERRIDE; 102 virtual String valueAsString() const override;
103 void setValueAsString(const String&, ExceptionState&); 103 void setValueAsString(const String&, ExceptionState&);
104 104
105 virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) OVERR IDE; 105 virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) overr ide;
106 virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRefPtr<SVGPropertyBa se> to, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextE lement) OVERRIDE; 106 virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRefPtr<SVGPropertyBa se> to, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextE lement) override;
107 virtual float calculateDistance(PassRefPtr<SVGPropertyBase> to, SVGElement* contextElement) OVERRIDE; 107 virtual float calculateDistance(PassRefPtr<SVGPropertyBase> to, SVGElement* contextElement) override;
108 108
109 static AnimatedPropertyType classType() { return AnimatedAngle; } 109 static AnimatedPropertyType classType() { return AnimatedAngle; }
110 110
111 private: 111 private:
112 SVGAngle(); 112 SVGAngle();
113 SVGAngle(SVGAngleType, float, SVGMarkerOrientType); 113 SVGAngle(SVGAngleType, float, SVGMarkerOrientType);
114 114
115 SVGAngleType m_unitType; 115 SVGAngleType m_unitType;
116 float m_valueInSpecifiedUnits; 116 float m_valueInSpecifiedUnits;
117 RefPtr<SVGMarkerOrientEnumeration> m_orientType; 117 RefPtr<SVGMarkerOrientEnumeration> m_orientType;
118 }; 118 };
119 119
120 inline PassRefPtr<SVGAngle> toSVGAngle(PassRefPtr<SVGPropertyBase> passBase) 120 inline PassRefPtr<SVGAngle> toSVGAngle(PassRefPtr<SVGPropertyBase> passBase)
121 { 121 {
122 RefPtr<SVGPropertyBase> base = passBase; 122 RefPtr<SVGPropertyBase> base = passBase;
123 ASSERT(base->type() == SVGAngle::classType()); 123 ASSERT(base->type() == SVGAngle::classType());
124 return static_pointer_cast<SVGAngle>(base.release()); 124 return static_pointer_cast<SVGAngle>(base.release());
125 } 125 }
126 126
127 } // namespace blink 127 } // namespace blink
128 128
129 #endif // SVGAngle_h 129 #endif // SVGAngle_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAltGlyphItemElement.h ('k') | Source/core/svg/SVGAngleTearOff.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698