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

Side by Side Diff: Source/core/svg/SVGPathByteStreamSource.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/SVGPathByteStreamBuilder.h ('k') | Source/core/svg/SVGPathElement.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) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #ifndef SVGPathByteStreamSource_h 20 #ifndef SVGPathByteStreamSource_h
21 #define SVGPathByteStreamSource_h 21 #define SVGPathByteStreamSource_h
22 22
23 #include "core/svg/SVGPathByteStream.h" 23 #include "core/svg/SVGPathByteStream.h"
24 #include "core/svg/SVGPathSource.h" 24 #include "core/svg/SVGPathSource.h"
25 #include "platform/geometry/FloatPoint.h" 25 #include "platform/geometry/FloatPoint.h"
26 #include "wtf/PassOwnPtr.h" 26 #include "wtf/PassOwnPtr.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 class SVGPathByteStreamSource FINAL : public SVGPathSource { 30 class SVGPathByteStreamSource final : public SVGPathSource {
31 public: 31 public:
32 explicit SVGPathByteStreamSource(const SVGPathByteStream*); 32 explicit SVGPathByteStreamSource(const SVGPathByteStream*);
33 33
34 private: 34 private:
35 virtual bool hasMoreData() const OVERRIDE; 35 virtual bool hasMoreData() const override;
36 virtual bool moveToNextToken() OVERRIDE { return true; } 36 virtual bool moveToNextToken() override { return true; }
37 virtual bool parseSVGSegmentType(SVGPathSegType&) OVERRIDE; 37 virtual bool parseSVGSegmentType(SVGPathSegType&) override;
38 virtual SVGPathSegType nextCommand(SVGPathSegType) OVERRIDE; 38 virtual SVGPathSegType nextCommand(SVGPathSegType) override;
39 39
40 virtual bool parseMoveToSegment(FloatPoint&) OVERRIDE; 40 virtual bool parseMoveToSegment(FloatPoint&) override;
41 virtual bool parseLineToSegment(FloatPoint&) OVERRIDE; 41 virtual bool parseLineToSegment(FloatPoint&) override;
42 virtual bool parseLineToHorizontalSegment(float&) OVERRIDE; 42 virtual bool parseLineToHorizontalSegment(float&) override;
43 virtual bool parseLineToVerticalSegment(float&) OVERRIDE; 43 virtual bool parseLineToVerticalSegment(float&) override;
44 virtual bool parseCurveToCubicSegment(FloatPoint&, FloatPoint&, FloatPoint&) OVERRIDE; 44 virtual bool parseCurveToCubicSegment(FloatPoint&, FloatPoint&, FloatPoint&) override;
45 virtual bool parseCurveToCubicSmoothSegment(FloatPoint&, FloatPoint&) OVERRI DE; 45 virtual bool parseCurveToCubicSmoothSegment(FloatPoint&, FloatPoint&) overri de;
46 virtual bool parseCurveToQuadraticSegment(FloatPoint&, FloatPoint&) OVERRIDE ; 46 virtual bool parseCurveToQuadraticSegment(FloatPoint&, FloatPoint&) override ;
47 virtual bool parseCurveToQuadraticSmoothSegment(FloatPoint&) OVERRIDE; 47 virtual bool parseCurveToQuadraticSmoothSegment(FloatPoint&) override;
48 virtual bool parseArcToSegment(float&, float&, float&, bool&, bool&, FloatPo int&) OVERRIDE; 48 virtual bool parseArcToSegment(float&, float&, float&, bool&, bool&, FloatPo int&) override;
49 49
50 #if COMPILER(MSVC) 50 #if COMPILER(MSVC)
51 #pragma warning(disable: 4701) 51 #pragma warning(disable: 4701)
52 #endif 52 #endif
53 template<typename DataType> 53 template<typename DataType>
54 DataType readType() 54 DataType readType()
55 { 55 {
56 ByteType<DataType> data; 56 ByteType<DataType> data;
57 size_t typeSize = sizeof(ByteType<DataType>); 57 size_t typeSize = sizeof(ByteType<DataType>);
58 ASSERT(m_streamCurrent + typeSize <= m_streamEnd); 58 ASSERT(m_streamCurrent + typeSize <= m_streamEnd);
(...skipping 12 matching lines...) Expand all
71 return FloatPoint(x, y); 71 return FloatPoint(x, y);
72 } 72 }
73 73
74 SVGPathByteStream::DataIterator m_streamCurrent; 74 SVGPathByteStream::DataIterator m_streamCurrent;
75 SVGPathByteStream::DataIterator m_streamEnd; 75 SVGPathByteStream::DataIterator m_streamEnd;
76 }; 76 };
77 77
78 } // namespace blink 78 } // namespace blink
79 79
80 #endif // SVGPathByteStreamSource_h 80 #endif // SVGPathByteStreamSource_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGPathByteStreamBuilder.h ('k') | Source/core/svg/SVGPathElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698