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

Side by Side Diff: gm/textblobmixedsizes.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 | « gm/textbloblooper.cpp ('k') | gm/textblobrandomfont.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 2015 Google Inc. 2 * Copyright 2015 Google Inc.
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 #include "gm.h" 8 #include "gm.h"
9 9
10 #include "Resources.h" 10 #include "Resources.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } 158 }
159 canvas->restore(); 159 canvas->restore();
160 160
161 #if SK_SUPPORT_GPU 161 #if SK_SUPPORT_GPU
162 // render offscreen buffer 162 // render offscreen buffer
163 if (surface) { 163 if (surface) {
164 SkAutoCanvasRestore acr(inputCanvas, true); 164 SkAutoCanvasRestore acr(inputCanvas, true);
165 // since we prepended this matrix already, we blit using identity 165 // since we prepended this matrix already, we blit using identity
166 inputCanvas->resetMatrix(); 166 inputCanvas->resetMatrix();
167 SkImage* image = surface->newImageSnapshot(); 167 SkImage* image = surface->newImageSnapshot();
168 inputCanvas->drawImage(image, 0, 0, NULL); 168 inputCanvas->drawImage(image, 0, 0, nullptr);
169 image->unref(); 169 image->unref();
170 } 170 }
171 #endif 171 #endif
172 } 172 }
173 173
174 private: 174 private:
175 SkAutoTUnref<const SkTextBlob> fBlob; 175 SkAutoTUnref<const SkTextBlob> fBlob;
176 176
177 static const int kWidth = 2000; 177 static const int kWidth = 2000;
178 static const int kHeight = 2000; 178 static const int kHeight = 2000;
179 179
180 bool fUseDFT; 180 bool fUseDFT;
181 181
182 typedef GM INHERITED; 182 typedef GM INHERITED;
183 }; 183 };
184 184
185 ////////////////////////////////////////////////////////////////////////////// 185 //////////////////////////////////////////////////////////////////////////////
186 186
187 DEF_GM( return new TextBlobMixedSizes(false); ) 187 DEF_GM( return new TextBlobMixedSizes(false); )
188 #if SK_SUPPORT_GPU 188 #if SK_SUPPORT_GPU
189 DEF_GM( return new TextBlobMixedSizes(true); ) 189 DEF_GM( return new TextBlobMixedSizes(true); )
190 #endif 190 #endif
191 } 191 }
OLDNEW
« no previous file with comments | « gm/textbloblooper.cpp ('k') | gm/textblobrandomfont.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698