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

Side by Side Diff: tests/ImageNewShaderTest.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 | « tests/ImageIsOpaqueTest.cpp ('k') | tests/ImageTest.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 "SkTypes.h" 8 #include "SkTypes.h"
9 #if SK_SUPPORT_GPU 9 #if SK_SUPPORT_GPU
10 #include "GrContextFactory.h" 10 #include "GrContextFactory.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 DEF_GPUTEST(ImageNewShader_GPU, reporter, factory) { 146 DEF_GPUTEST(ImageNewShader_GPU, reporter, factory) {
147 for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { 147 for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) {
148 GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContext Type) i; 148 GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContext Type) i;
149 149
150 if (!GrContextFactory::IsRenderingGLContext(glCtxType)) { 150 if (!GrContextFactory::IsRenderingGLContext(glCtxType)) {
151 continue; 151 continue;
152 } 152 }
153 153
154 GrContext* context = factory->get(glCtxType); 154 GrContext* context = factory->get(glCtxType);
155 155
156 if (NULL == context) { 156 if (nullptr == context) {
157 continue; 157 continue;
158 } 158 }
159 159
160 // GPU -> GPU 160 // GPU -> GPU
161 gpuToGpu(reporter, context); 161 gpuToGpu(reporter, context);
162 162
163 // GPU -> RASTER 163 // GPU -> RASTER
164 gpuToRaster(reporter, context); 164 gpuToRaster(reporter, context);
165 165
166 // RASTER -> GPU 166 // RASTER -> GPU
167 rasterToGpu(reporter, context); 167 rasterToGpu(reporter, context);
168 } 168 }
169 } 169 }
170 170
171 #endif 171 #endif
OLDNEW
« no previous file with comments | « tests/ImageIsOpaqueTest.cpp ('k') | tests/ImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698