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

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

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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/SkOperandIterpolator.cpp ('k') | src/animator/SkPaintPart.cpp » ('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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkPaintPart_DEFINED 8 #ifndef SkPaintPart_DEFINED
9 #define SkPaintPart_DEFINED 9 #define SkPaintPart_DEFINED
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 protected: 44 protected:
45 bool add() override; 45 bool add() override;
46 }; 46 };
47 47
48 class SkDrawShader : public SkPaintPart { 48 class SkDrawShader : public SkPaintPart {
49 DECLARE_DRAW_MEMBER_INFO(Shader); 49 DECLARE_DRAW_MEMBER_INFO(Shader);
50 SkDrawShader(); 50 SkDrawShader();
51 virtual SkShader* getShader(); 51 virtual SkShader* getShader();
52 protected: 52 protected:
53 bool add() override; 53 bool add() override;
54 SkMatrix* getMatrix(); // returns NULL if matrix is NULL 54 SkMatrix* getMatrix(); // returns nullptr if matrix is nullptr
55 SkDrawMatrix* matrix; 55 SkDrawMatrix* matrix;
56 int /*SkShader::TileMode*/ tileMode; 56 int /*SkShader::TileMode*/ tileMode;
57 }; 57 };
58 58
59 class SkDrawTypeface : public SkPaintPart { 59 class SkDrawTypeface : public SkPaintPart {
60 DECLARE_DRAW_MEMBER_INFO(Typeface); 60 DECLARE_DRAW_MEMBER_INFO(Typeface);
61 SkDrawTypeface(); 61 SkDrawTypeface();
62 #ifdef SK_DUMP_ENABLED 62 #ifdef SK_DUMP_ENABLED
63 void dump(SkAnimateMaker *) override; 63 void dump(SkAnimateMaker *) override;
64 #endif 64 #endif
65 SkTypeface* getTypeface() { 65 SkTypeface* getTypeface() {
66 return SkTypeface::CreateFromName(fontName.c_str(), style); } 66 return SkTypeface::CreateFromName(fontName.c_str(), style); }
67 protected: 67 protected:
68 bool add() override; 68 bool add() override;
69 SkString fontName; 69 SkString fontName;
70 SkTypeface::Style style; 70 SkTypeface::Style style;
71 }; 71 };
72 72
73 #endif // SkPaintPart_DEFINED 73 #endif // SkPaintPart_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkOperandIterpolator.cpp ('k') | src/animator/SkPaintPart.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698