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

Side by Side Diff: src/animator/SkDrawGradient.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 | « src/animator/SkDrawFull.h ('k') | src/animator/SkDrawGroup.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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkDrawGradient_DEFINED 10 #ifndef SkDrawGradient_DEFINED
11 #define SkDrawGradient_DEFINED 11 #define SkDrawGradient_DEFINED
12 12
13 #include "SkDrawColor.h" 13 #include "SkDrawColor.h"
14 #include "SkDrawShader.h" 14 #include "SkDrawShader.h"
15 #include "SkIntArray.h" 15 #include "SkIntArray.h"
16 16
17 class SkDrawGradient : public SkDrawShader { 17 class SkDrawGradient : public SkDrawShader {
18 DECLARE_PRIVATE_MEMBER_INFO(DrawGradient); 18 DECLARE_PRIVATE_MEMBER_INFO(DrawGradient);
19 SkDrawGradient(); 19 SkDrawGradient();
20 virtual ~SkDrawGradient(); 20 virtual ~SkDrawGradient();
21 bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; 21 bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
22 #ifdef SK_DUMP_ENABLED 22 #ifdef SK_DUMP_ENABLED
23 virtual void dumpRest(SkAnimateMaker*); 23 virtual void dumpRest(SkAnimateMaker*);
24 #endif 24 #endif
25 void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; 25 void onEndElement(SkAnimateMaker& ) override;
26 protected: 26 protected:
27 SkTDScalarArray offsets; 27 SkTDScalarArray offsets;
28 SkString unitMapper; 28 SkString unitMapper;
29 SkTDColorArray fColors; 29 SkTDColorArray fColors;
30 SkTDDrawColorArray fDrawColors; 30 SkTDDrawColorArray fDrawColors;
31 int addPrelude(); 31 int addPrelude();
32 private: 32 private:
33 typedef SkDrawShader INHERITED; 33 typedef SkDrawShader INHERITED;
34 }; 34 };
35 35
36 class SkDrawLinearGradient : public SkDrawGradient { 36 class SkDrawLinearGradient : public SkDrawGradient {
37 DECLARE_MEMBER_INFO(DrawLinearGradient); 37 DECLARE_MEMBER_INFO(DrawLinearGradient);
38 SkDrawLinearGradient(); 38 SkDrawLinearGradient();
39 void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; 39 void onEndElement(SkAnimateMaker& ) override;
40 #ifdef SK_DUMP_ENABLED 40 #ifdef SK_DUMP_ENABLED
41 void dump(SkAnimateMaker*) SK_OVERRIDE; 41 void dump(SkAnimateMaker*) override;
42 #endif 42 #endif
43 SkShader* getShader() SK_OVERRIDE; 43 SkShader* getShader() override;
44 protected: 44 protected:
45 SkTDScalarArray points; 45 SkTDScalarArray points;
46 private: 46 private:
47 typedef SkDrawGradient INHERITED; 47 typedef SkDrawGradient INHERITED;
48 }; 48 };
49 49
50 class SkDrawRadialGradient : public SkDrawGradient { 50 class SkDrawRadialGradient : public SkDrawGradient {
51 DECLARE_MEMBER_INFO(DrawRadialGradient); 51 DECLARE_MEMBER_INFO(DrawRadialGradient);
52 SkDrawRadialGradient(); 52 SkDrawRadialGradient();
53 #ifdef SK_DUMP_ENABLED 53 #ifdef SK_DUMP_ENABLED
54 void dump(SkAnimateMaker*) SK_OVERRIDE; 54 void dump(SkAnimateMaker*) override;
55 #endif 55 #endif
56 SkShader* getShader() SK_OVERRIDE; 56 SkShader* getShader() override;
57 protected: 57 protected:
58 SkPoint center; 58 SkPoint center;
59 SkScalar radius; 59 SkScalar radius;
60 private: 60 private:
61 typedef SkDrawGradient INHERITED; 61 typedef SkDrawGradient INHERITED;
62 }; 62 };
63 63
64 #endif // SkDrawGradient_DEFINED 64 #endif // SkDrawGradient_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDrawFull.h ('k') | src/animator/SkDrawGroup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698