| Index: src/image/SkSurface_Base.h
|
| diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h
|
| index 8f0eef3b60e4c854ae0734bff00fc2d11c903b1a..7658409ad764eb78cdcb330d5ea13897d986c83f 100644
|
| --- a/src/image/SkSurface_Base.h
|
| +++ b/src/image/SkSurface_Base.h
|
| @@ -77,7 +77,7 @@ public:
|
| inline SkCanvas* getCachedCanvas();
|
| inline SkImage* getCachedImage(Budgeted);
|
|
|
| - bool hasCachedImage() const { return fCachedImage != NULL; }
|
| + bool hasCachedImage() const { return fCachedImage != nullptr; }
|
|
|
| // called by SkSurface to compute a new genID
|
| uint32_t newGenerationID();
|
| @@ -99,7 +99,7 @@ private:
|
| };
|
|
|
| SkCanvas* SkSurface_Base::getCachedCanvas() {
|
| - if (NULL == fCachedCanvas) {
|
| + if (nullptr == fCachedCanvas) {
|
| fCachedCanvas = this->onNewCanvas();
|
| if (fCachedCanvas) {
|
| fCachedCanvas->setSurfaceBase(this);
|
| @@ -109,7 +109,7 @@ SkCanvas* SkSurface_Base::getCachedCanvas() {
|
| }
|
|
|
| SkImage* SkSurface_Base::getCachedImage(Budgeted budgeted) {
|
| - if (NULL == fCachedImage) {
|
| + if (nullptr == fCachedImage) {
|
| fCachedImage = this->onNewImageSnapshot(budgeted);
|
| SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this);
|
| }
|
|
|