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

Unified Diff: src/pipe/utils/SamplePipeControllers.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, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/pipe/utils/SamplePipeControllers.h ('k') | src/ports/SkFontConfigInterface_direct.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pipe/utils/SamplePipeControllers.cpp
diff --git a/src/pipe/utils/SamplePipeControllers.cpp b/src/pipe/utils/SamplePipeControllers.cpp
index b85ceb6790f993f717080500ddeb8d44543bc775..fea9d6842b7fac2baf3e358082d1aee776aae811 100644
--- a/src/pipe/utils/SamplePipeControllers.cpp
+++ b/src/pipe/utils/SamplePipeControllers.cpp
@@ -13,7 +13,7 @@
PipeController::PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc)
:fReader(target) {
- fBlock = NULL;
+ fBlock = nullptr;
fBlockSize = fBytesWritten = 0;
fReader.setBitmapDecoder(proc);
}
@@ -42,7 +42,7 @@ void PipeController::notifyWritten(size_t bytes) {
TiledPipeController::TiledPipeController(const SkBitmap& bitmap,
SkPicture::InstallPixelRefProc proc,
const SkMatrix* initial)
-: INHERITED(NULL, proc) {
+: INHERITED(nullptr, proc) {
int32_t top = 0;
int32_t bottom;
int32_t height = bitmap.height() / NumberOfTiles;
@@ -55,7 +55,7 @@ TiledPipeController::TiledPipeController(const SkBitmap& bitmap,
SkDEBUGCODE(bool extracted = )bitmap.extractSubset(&fBitmaps[i], rect);
SkASSERT(extracted);
SkCanvas* canvas = new SkCanvas(fBitmaps[i]);
- if (initial != NULL) {
+ if (initial != nullptr) {
canvas->setMatrix(*initial);
}
canvas->translate(SkIntToScalar(-rect.left()),
@@ -82,7 +82,7 @@ void TiledPipeController::notifyWritten(size_t bytes) {
ThreadSafePipeController::ThreadSafePipeController(int numberOfReaders)
: fAllocator(kMinBlockSize)
, fNumberOfReaders(numberOfReaders) {
- fBlock = NULL;
+ fBlock = nullptr;
fBytesWritten = 0;
}
« no previous file with comments | « src/pipe/utils/SamplePipeControllers.h ('k') | src/ports/SkFontConfigInterface_direct.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698