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

Side by Side Diff: Source/core/svg/SVGPreserveAspectRatio.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/SVGPolylineElement.h ('k') | Source/core/svg/SVGPreserveAspectRatioTearOff.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, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 void setMeetOrSlice(SVGMeetOrSliceType meetOrSlice) { m_meetOrSlice = meetOr Slice; } 69 void setMeetOrSlice(SVGMeetOrSliceType meetOrSlice) { m_meetOrSlice = meetOr Slice; }
70 SVGMeetOrSliceType meetOrSlice() const { return m_meetOrSlice; } 70 SVGMeetOrSliceType meetOrSlice() const { return m_meetOrSlice; }
71 71
72 void transformRect(FloatRect& destRect, FloatRect& srcRect); 72 void transformRect(FloatRect& destRect, FloatRect& srcRect);
73 73
74 AffineTransform getCTM(float logicX, float logicY, 74 AffineTransform getCTM(float logicX, float logicY,
75 float logicWidth, float logicHeight, 75 float logicWidth, float logicHeight,
76 float physWidth, float physHeight) const; 76 float physWidth, float physHeight) const;
77 77
78 virtual String valueAsString() const OVERRIDE; 78 virtual String valueAsString() const override;
79 virtual void setValueAsString(const String&, ExceptionState&); 79 virtual void setValueAsString(const String&, ExceptionState&);
80 bool parse(const UChar*& ptr, const UChar* end, bool validate); 80 bool parse(const UChar*& ptr, const UChar* end, bool validate);
81 bool parse(const LChar*& ptr, const LChar* end, bool validate); 81 bool parse(const LChar*& ptr, const LChar* end, bool validate);
82 82
83 virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) OVERR IDE; 83 virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) overr ide;
84 virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRefPtr<SVGPropertyBa se> to, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextE lement) OVERRIDE; 84 virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRefPtr<SVGPropertyBa se> to, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextE lement) override;
85 virtual float calculateDistance(PassRefPtr<SVGPropertyBase> to, SVGElement* contextElement) OVERRIDE; 85 virtual float calculateDistance(PassRefPtr<SVGPropertyBase> to, SVGElement* contextElement) override;
86 86
87 static AnimatedPropertyType classType() { return AnimatedPreserveAspectRatio ; } 87 static AnimatedPropertyType classType() { return AnimatedPreserveAspectRatio ; }
88 88
89 private: 89 private:
90 SVGPreserveAspectRatio(); 90 SVGPreserveAspectRatio();
91 91
92 void setDefault(); 92 void setDefault();
93 template<typename CharType> 93 template<typename CharType>
94 bool parseInternal(const CharType*& ptr, const CharType* end, bool validate) ; 94 bool parseInternal(const CharType*& ptr, const CharType* end, bool validate) ;
95 95
96 SVGPreserveAspectRatioType m_align; 96 SVGPreserveAspectRatioType m_align;
97 SVGMeetOrSliceType m_meetOrSlice; 97 SVGMeetOrSliceType m_meetOrSlice;
98 }; 98 };
99 99
100 inline PassRefPtr<SVGPreserveAspectRatio> toSVGPreserveAspectRatio(PassRefPtr<SV GPropertyBase> passBase) 100 inline PassRefPtr<SVGPreserveAspectRatio> toSVGPreserveAspectRatio(PassRefPtr<SV GPropertyBase> passBase)
101 { 101 {
102 RefPtr<SVGPropertyBase> base = passBase; 102 RefPtr<SVGPropertyBase> base = passBase;
103 ASSERT(base->type() == SVGPreserveAspectRatio::classType()); 103 ASSERT(base->type() == SVGPreserveAspectRatio::classType());
104 return static_pointer_cast<SVGPreserveAspectRatio>(base.release()); 104 return static_pointer_cast<SVGPreserveAspectRatio>(base.release());
105 } 105 }
106 106
107 } // namespace blink 107 } // namespace blink
108 108
109 #endif // SVGPreserveAspectRatio_h 109 #endif // SVGPreserveAspectRatio_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGPolylineElement.h ('k') | Source/core/svg/SVGPreserveAspectRatioTearOff.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698