aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleAnimator.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /samplecode/SampleAnimator.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'samplecode/SampleAnimator.cpp')
-rw-r--r--samplecode/SampleAnimator.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/samplecode/SampleAnimator.cpp b/samplecode/SampleAnimator.cpp
index a7cc8851ea..8b7af68cb3 100644
--- a/samplecode/SampleAnimator.cpp
+++ b/samplecode/SampleAnimator.cpp
@@ -40,7 +40,7 @@ private:
typedef SkView INHERITED;
};
-SkAnimatorView::SkAnimatorView() : fAnimator(NULL) {}
+SkAnimatorView::SkAnimatorView() : fAnimator(nullptr) {}
SkAnimatorView::~SkAnimatorView() {
delete fAnimator;
@@ -52,7 +52,7 @@ void SkAnimatorView::setURIBase(const char dir[]) {
bool SkAnimatorView::decodeFile(const char path[]) {
SkAutoTDelete<SkStream> is(SkStream::NewFromFile(path));
- return is.get() != NULL && this->decodeStream(is);
+ return is.get() != nullptr && this->decodeStream(is);
}
bool SkAnimatorView::decodeMemory(const void* buffer, size_t size) {
@@ -62,7 +62,7 @@ bool SkAnimatorView::decodeMemory(const void* buffer, size_t size) {
static const SkDOMNode* find_nodeID(const SkDOM& dom,
const SkDOMNode* node, const char name[]) {
- if (NULL == node) {
+ if (nullptr == node) {
node = dom.getRootNode();
}
do {
@@ -77,8 +77,8 @@ static const SkDOMNode* find_nodeID(const SkDOM& dom,
return found;
}
}
- } while ((node = dom.getNextSibling(node)) != NULL);
- return NULL;
+ } while ((node = dom.getNextSibling(node)) != nullptr);
+ return nullptr;
}
bool SkAnimatorView::decodeStream(SkStream* stream) {
@@ -88,7 +88,7 @@ bool SkAnimatorView::decodeStream(SkStream* stream) {
#if 0
if (!fAnimator->decodeStream(stream)) {
delete fAnimator;
- fAnimator = NULL;
+ fAnimator = nullptr;
return false;
}
#else
@@ -97,18 +97,18 @@ bool SkAnimatorView::decodeStream(SkStream* stream) {
stream->read(text, len);
SkDOM dom;
const SkDOM::Node* root = dom.build(text, len);
- if (NULL == root) {
+ if (nullptr == root) {
return false;
}
if (!fAnimator->decodeDOM(dom, root)) {
delete fAnimator;
- fAnimator = NULL;
+ fAnimator = nullptr;
return false;
}
for (int i = 0; i <= 10; i++) {
SkString name("glyph");
name.appendS32(i);
- const SkDOM::Node* node = find_nodeID(dom, NULL, name.c_str());
+ const SkDOM::Node* node = find_nodeID(dom, nullptr, name.c_str());
SkASSERT(node);
SkRect r;
dom.findScalar(node, "left", &r.fLeft);
@@ -141,7 +141,7 @@ void SkAnimatorView::onDraw(SkCanvas* canvas) {
fAnimator->draw(canvas, 0);
canvas->restore();
- this->inval(NULL);
+ this->inval(nullptr);
#endif
}
}