aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkPicture.h
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-08-28 10:34:05 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-28 17:48:57 +0000
commita93a14a99816d25b773f0b12868143702baf44bf (patch)
tree727e7cb88867bdc12cbcf8baa354ae3afc9444e2 /include/core/SkPicture.h
parent695db408437807d049ecc02b3b852704092728f2 (diff)
Convert NULL and 0 to nullptr.
This was created by looking at warnings produced by clang's -Wzero-as-null-pointer-constant. This updates most issues in Skia code. However, there are places where GL and Vulkan want pointer values which are explicitly 0, external headers which use NULL directly, and possibly more uses in un-compiled sources (for other platforms). Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345 Reviewed-on: https://skia-review.googlesource.com/39521 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/core/SkPicture.h')
-rw-r--r--include/core/SkPicture.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 891c11dae5..290434c8ad 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -96,7 +96,7 @@ public:
@param canvas the canvas receiving the drawing commands.
@param callback a callback that allows interruption of playback
*/
- virtual void playback(SkCanvas*, AbortCallback* = NULL) const = 0;
+ virtual void playback(SkCanvas*, AbortCallback* = nullptr) const = 0;
/** Return a cull rect for this picture.
Ops recorded into this picture that attempt to draw outside the cull might not be drawn.
@@ -152,11 +152,11 @@ public:
#ifdef SK_SUPPORT_LEGACY_PICTURE_GPUVETO
/** Return true if the picture is suitable for rendering on the GPU. */
- bool suitableForGpuRasterization(GrContext*, const char** whyNot = NULL) const;
+ bool suitableForGpuRasterization(GrContext*, const char** whyNot = nullptr) const;
#endif
// Returns NULL if this is not an SkBigPicture.
- virtual const SkBigPicture* asSkBigPicture() const { return NULL; }
+ virtual const SkBigPicture* asSkBigPicture() const { return nullptr; }
// Global setting to enable or disable security precautions for serialization.
static void SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set);