diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/pipe/utils | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/pipe/utils')
| -rw-r--r-- | src/pipe/utils/SamplePipeControllers.cpp | 8 | ||||
| -rw-r--r-- | src/pipe/utils/SamplePipeControllers.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/pipe/utils/SamplePipeControllers.cpp b/src/pipe/utils/SamplePipeControllers.cpp index b85ceb6790..fea9d6842b 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; } diff --git a/src/pipe/utils/SamplePipeControllers.h b/src/pipe/utils/SamplePipeControllers.h index 5e074c565c..b3f057fa8c 100644 --- a/src/pipe/utils/SamplePipeControllers.h +++ b/src/pipe/utils/SamplePipeControllers.h @@ -16,7 +16,7 @@ class SkMatrix; class PipeController : public SkGPipeController { public: - PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc = NULL); + PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc = nullptr); virtual ~PipeController(); void* requestBlock(size_t minRequest, size_t* actual) override; void notifyWritten(size_t bytes) override; @@ -34,8 +34,8 @@ private: class TiledPipeController : public PipeController { public: - TiledPipeController(const SkBitmap&, SkPicture::InstallPixelRefProc proc = NULL, - const SkMatrix* initialMatrix = NULL); + TiledPipeController(const SkBitmap&, SkPicture::InstallPixelRefProc proc = nullptr, + const SkMatrix* initialMatrix = nullptr); virtual ~TiledPipeController() {}; void notifyWritten(size_t bytes) override; int numberOfReaders() const override { return NumberOfTiles; } |