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

Side by Side Diff: src/animator/SkDrawRectangle.cpp

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/SkDrawPath.cpp ('k') | src/animator/SkDrawSaveLayer.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 /* 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 #include "SkDrawRectangle.h" 10 #include "SkDrawRectangle.h"
(...skipping 18 matching lines...) Expand all
29 SK_MEMBER_PROPERTY(needsRedraw, Boolean), 29 SK_MEMBER_PROPERTY(needsRedraw, Boolean),
30 SK_MEMBER_ALIAS(right, fRect.fRight, Float), 30 SK_MEMBER_ALIAS(right, fRect.fRight, Float),
31 SK_MEMBER_ALIAS(top, fRect.fTop, Float), 31 SK_MEMBER_ALIAS(top, fRect.fTop, Float),
32 SK_MEMBER_PROPERTY(width, Float) 32 SK_MEMBER_PROPERTY(width, Float)
33 }; 33 };
34 34
35 #endif 35 #endif
36 36
37 DEFINE_GET_MEMBER(SkDrawRect); 37 DEFINE_GET_MEMBER(SkDrawRect);
38 38
39 SkDrawRect::SkDrawRect() : fParent(NULL) { 39 SkDrawRect::SkDrawRect() : fParent(nullptr) {
40 fRect.setEmpty(); 40 fRect.setEmpty();
41 } 41 }
42 42
43 void SkDrawRect::dirty() { 43 void SkDrawRect::dirty() {
44 if (fParent) 44 if (fParent)
45 fParent->dirty(); 45 fParent->dirty();
46 } 46 }
47 47
48 bool SkDrawRect::draw(SkAnimateMaker& maker) { 48 bool SkDrawRect::draw(SkAnimateMaker& maker) {
49 SkBoundableAuto boundable(this, maker); 49 SkBoundableAuto boundable(this, maker);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 134
135 #ifdef SK_DUMP_ENABLED 135 #ifdef SK_DUMP_ENABLED
136 void SkRoundRect::dump(SkAnimateMaker* maker) { 136 void SkRoundRect::dump(SkAnimateMaker* maker) {
137 dumpBase(maker); 137 dumpBase(maker);
138 SkDebugf("left=\"%g\" top=\"%g\" right=\"%g\" bottom=\"%g\" rx=\"%g\" ry=\"% g\" />\n", 138 SkDebugf("left=\"%g\" top=\"%g\" right=\"%g\" bottom=\"%g\" rx=\"%g\" ry=\"% g\" />\n",
139 SkScalarToFloat(fRect.fLeft), SkScalarToFloat(fRect.fTop), SkScalarT oFloat(fRect.fRight), 139 SkScalarToFloat(fRect.fLeft), SkScalarToFloat(fRect.fTop), SkScalarT oFloat(fRect.fRight),
140 SkScalarToFloat(fRect.fBottom), SkScalarToFloat(rx), SkScalarToFloat (ry)); 140 SkScalarToFloat(fRect.fBottom), SkScalarToFloat(rx), SkScalarToFloat (ry));
141 } 141 }
142 #endif 142 #endif
OLDNEW
« no previous file with comments | « src/animator/SkDrawPath.cpp ('k') | src/animator/SkDrawSaveLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698