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

Side by Side Diff: tests/IndexedPngOverflowTest.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/ImageTest.cpp ('k') | tests/JpegTest.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 "SkBitmap.h" 8 #include "SkBitmap.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkForceLinking.h" 10 #include "SkForceLinking.h"
(...skipping 22 matching lines...) Expand all
33 SkBitmap image; 33 SkBitmap image;
34 SkForceLinking(false); 34 SkForceLinking(false);
35 bool success = SkImageDecoder::DecodeMemory( 35 bool success = SkImageDecoder::DecodeMemory(
36 gPng, sizeof(gPng), &image, SkColorType::kUnknown_SkColorType, 36 gPng, sizeof(gPng), &image, SkColorType::kUnknown_SkColorType,
37 SkImageDecoder::kDecodePixels_Mode); 37 SkImageDecoder::kDecodePixels_Mode);
38 REPORTER_ASSERT(reporter, success); 38 REPORTER_ASSERT(reporter, success);
39 39
40 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(SkImageInfo::MakeN32Pre mul(20, 1))); 40 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(SkImageInfo::MakeN32Pre mul(20, 1)));
41 SkCanvas* canvas = surface->getCanvas(); 41 SkCanvas* canvas = surface->getCanvas();
42 SkRect destRect = SkRect::MakeXYWH(0, 0, 20, 1); 42 SkRect destRect = SkRect::MakeXYWH(0, 0, 20, 1);
43 canvas->drawBitmapRect(image, destRect, NULL); 43 canvas->drawBitmapRect(image, destRect, nullptr);
44 } 44 }
OLDNEW
« no previous file with comments | « tests/ImageTest.cpp ('k') | tests/JpegTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698