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

Side by Side Diff: src/animator/SkDrawGradient.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/SkDrawExtraPathEffect.cpp ('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 #include "SkDrawGradient.h" 10 #include "SkDrawGradient.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 #ifdef SK_DUMP_ENABLED 121 #ifdef SK_DUMP_ENABLED
122 void SkDrawLinearGradient::dump(SkAnimateMaker* maker) { 122 void SkDrawLinearGradient::dump(SkAnimateMaker* maker) {
123 dumpBase(maker); 123 dumpBase(maker);
124 dumpRest(maker); 124 dumpRest(maker);
125 } 125 }
126 #endif 126 #endif
127 127
128 SkShader* SkDrawLinearGradient::getShader() { 128 SkShader* SkDrawLinearGradient::getShader() {
129 if (addPrelude() == 0 || points.count() != 4) 129 if (addPrelude() == 0 || points.count() != 4)
130 return NULL; 130 return nullptr;
131 SkShader* shader = SkGradientShader::CreateLinear((SkPoint*)points.begin(), 131 SkShader* shader = SkGradientShader::CreateLinear((SkPoint*)points.begin(),
132 fColors.begin(), offsets.begin(), fColors.count(), (SkShader::TileMode) tileMode, 132 fColors.begin(), offsets.begin(), fColors.count(), (SkShader::TileMode) tileMode,
133 0, getMatrix()); 133 0, getMatrix());
134 SkAutoTDelete<SkShader> autoDel(shader); 134 SkAutoTDelete<SkShader> autoDel(shader);
135 (void)autoDel.detach(); 135 (void)autoDel.detach();
136 return shader; 136 return shader;
137 } 137 }
138 138
139 139
140 #if SK_USE_CONDENSED_INFO == 0 140 #if SK_USE_CONDENSED_INFO == 0
(...skipping 14 matching lines...) Expand all
155 155
156 #ifdef SK_DUMP_ENABLED 156 #ifdef SK_DUMP_ENABLED
157 void SkDrawRadialGradient::dump(SkAnimateMaker* maker) { 157 void SkDrawRadialGradient::dump(SkAnimateMaker* maker) {
158 dumpBase(maker); 158 dumpBase(maker);
159 dumpRest(maker); 159 dumpRest(maker);
160 } 160 }
161 #endif 161 #endif
162 162
163 SkShader* SkDrawRadialGradient::getShader() { 163 SkShader* SkDrawRadialGradient::getShader() {
164 if (addPrelude() == 0) 164 if (addPrelude() == 0)
165 return NULL; 165 return nullptr;
166 SkShader* shader = SkGradientShader::CreateRadial(center, 166 SkShader* shader = SkGradientShader::CreateRadial(center,
167 radius, fColors.begin(), offsets.begin(), fColors.count(), (SkShader::Ti leMode) tileMode, 167 radius, fColors.begin(), offsets.begin(), fColors.count(), (SkShader::Ti leMode) tileMode,
168 0, getMatrix()); 168 0, getMatrix());
169 SkAutoTDelete<SkShader> autoDel(shader); 169 SkAutoTDelete<SkShader> autoDel(shader);
170 (void)autoDel.detach(); 170 (void)autoDel.detach();
171 return shader; 171 return shader;
172 } 172 }
OLDNEW
« no previous file with comments | « src/animator/SkDrawExtraPathEffect.cpp ('k') | src/animator/SkDrawGroup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698