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

Side by Side Diff: bench/subset/SubsetBenchPriv.h

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 | « bench/nanobench.cpp ('k') | bench/subset/SubsetSingleBench.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 The Android Open Source Project 2 * Copyright 2015 The Android Open Source Project
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 #ifndef SubsetBenchPriv_DEFINED 8 #ifndef SubsetBenchPriv_DEFINED
9 #define SubsetBenchPriv_DEFINED 9 #define SubsetBenchPriv_DEFINED
10 10
(...skipping 23 matching lines...) Expand all
34 34
35 /* 35 /*
36 * If we plan to decode to kIndex8, we must create a color table and pass it to the 36 * If we plan to decode to kIndex8, we must create a color table and pass it to the
37 * bitmap when we allocate pixels. Otherwise, we simply allocate pixels using t he 37 * bitmap when we allocate pixels. Otherwise, we simply allocate pixels using t he
38 * decode info. 38 * decode info.
39 */ 39 */
40 static inline void alloc_pixels(SkBitmap* bitmap, const SkImageInfo& info, SkPMC olor* colors, 40 static inline void alloc_pixels(SkBitmap* bitmap, const SkImageInfo& info, SkPMC olor* colors,
41 int colorCount) { 41 int colorCount) {
42 if (kIndex_8_SkColorType == info.colorType()) { 42 if (kIndex_8_SkColorType == info.colorType()) {
43 SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, colorCoun t)); 43 SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, colorCoun t));
44 bitmap->allocPixels(info, NULL, colorTable); 44 bitmap->allocPixels(info, nullptr, colorTable);
45 } else { 45 } else {
46 bitmap->allocPixels(info); 46 bitmap->allocPixels(info);
47 } 47 }
48 } 48 }
49 49
50 #endif // SubsetBenchPriv_DEFINED 50 #endif // SubsetBenchPriv_DEFINED
OLDNEW
« no previous file with comments | « bench/nanobench.cpp ('k') | bench/subset/SubsetSingleBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698