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

Side by Side Diff: gm/simpleaaclip.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/shallowgradient.cpp ('k') | gm/spritebitmap.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 2012 Google Inc. 2 * Copyright 2012 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 #include "SkAAClip.h" 9 #include "SkAAClip.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 fRect = fBase; 61 fRect = fBase;
62 fRect.inset(5, 5); 62 fRect.inset(5, 5);
63 fRect.offset(25, 25); 63 fRect.offset(25, 25);
64 64
65 fBasePath.addRoundRect(fBase, SkIntToScalar(5), SkIntToScalar(5)); 65 fBasePath.addRoundRect(fBase, SkIntToScalar(5), SkIntToScalar(5));
66 fRectPath.addRoundRect(fRect, SkIntToScalar(5), SkIntToScalar(5)); 66 fRectPath.addRoundRect(fRect, SkIntToScalar(5), SkIntToScalar(5));
67 INHERITED::setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); 67 INHERITED::setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
68 } 68 }
69 69
70 void buildRgn(SkAAClip* clip, SkRegion::Op op) { 70 void buildRgn(SkAAClip* clip, SkRegion::Op op) {
71 clip->setPath(fBasePath, NULL, true); 71 clip->setPath(fBasePath, nullptr, true);
72 72
73 SkAAClip clip2; 73 SkAAClip clip2;
74 clip2.setPath(fRectPath, NULL, true); 74 clip2.setPath(fRectPath, nullptr, true);
75 clip->op(clip2, op); 75 clip->op(clip2, op);
76 } 76 }
77 77
78 void drawOrig(SkCanvas* canvas) { 78 void drawOrig(SkCanvas* canvas) {
79 SkPaint paint; 79 SkPaint paint;
80 80
81 paint.setStyle(SkPaint::kStroke_Style); 81 paint.setStyle(SkPaint::kStroke_Style);
82 paint.setColor(SK_ColorBLACK); 82 paint.setColor(SK_ColorBLACK);
83 83
84 canvas->drawRect(fBase, paint); 84 canvas->drawRect(fBase, paint);
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 }; 194 };
195 195
196 ////////////////////////////////////////////////////////////////////////////// 196 //////////////////////////////////////////////////////////////////////////////
197 197
198 // rects 198 // rects
199 DEF_GM( return new SimpleClipGM(SimpleClipGM::kRect_GeomType); ) 199 DEF_GM( return new SimpleClipGM(SimpleClipGM::kRect_GeomType); )
200 DEF_GM( return new SimpleClipGM(SimpleClipGM::kPath_GeomType); ) 200 DEF_GM( return new SimpleClipGM(SimpleClipGM::kPath_GeomType); )
201 DEF_GM( return new SimpleClipGM(SimpleClipGM::kAAClip_GeomType); ) 201 DEF_GM( return new SimpleClipGM(SimpleClipGM::kAAClip_GeomType); )
202 202
203 } 203 }
OLDNEW
« no previous file with comments | « gm/shallowgradient.cpp ('k') | gm/spritebitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698