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

Side by Side Diff: gm/pictureshadertile.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/pictureshader.cpp ('k') | gm/resizeimagefilter.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 2014 Google Inc. 2 * Copyright 2014 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 "SkPaint.h" 10 #include "SkPaint.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 tiles[i].offsetY * kPictureSize); 114 tiles[i].offsetY * kPictureSize);
115 localMatrix.postScale(kFillSize / (2 * kPictureSize), 115 localMatrix.postScale(kFillSize / (2 * kPictureSize),
116 kFillSize / (2 * kPictureSize)); 116 kFillSize / (2 * kPictureSize));
117 117
118 SkPicture* picturePtr = picture.get(); 118 SkPicture* picturePtr = picture.get();
119 SkRect* tilePtr = &tile; 119 SkRect* tilePtr = &tile;
120 120
121 if (tile == SkRect::MakeWH(kPictureSize, kPictureSize)) { 121 if (tile == SkRect::MakeWH(kPictureSize, kPictureSize)) {
122 // When the tile == picture bounds, exercise the picture + offse t path. 122 // When the tile == picture bounds, exercise the picture + offse t path.
123 picturePtr = offsetPicture.get(); 123 picturePtr = offsetPicture.get();
124 tilePtr = NULL; 124 tilePtr = nullptr;
125 } 125 }
126 126
127 fShaders[i].reset(SkShader::CreatePictureShader(picturePtr, 127 fShaders[i].reset(SkShader::CreatePictureShader(picturePtr,
128 SkShader::kRepeat_Ti leMode, 128 SkShader::kRepeat_Ti leMode,
129 SkShader::kRepeat_Ti leMode, 129 SkShader::kRepeat_Ti leMode,
130 &localMatrix, 130 &localMatrix,
131 tilePtr)); 131 tilePtr));
132 } 132 }
133 } 133 }
134 134
(...skipping 14 matching lines...) Expand all
149 } 149 }
150 } 150 }
151 151
152 private: 152 private:
153 SkAutoTUnref<SkShader> fShaders[SK_ARRAY_COUNT(tiles)]; 153 SkAutoTUnref<SkShader> fShaders[SK_ARRAY_COUNT(tiles)];
154 154
155 typedef GM INHERITED; 155 typedef GM INHERITED;
156 }; 156 };
157 157
158 DEF_GM(return new PictureShaderTileGM;) 158 DEF_GM(return new PictureShaderTileGM;)
OLDNEW
« no previous file with comments | « gm/pictureshader.cpp ('k') | gm/resizeimagefilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698