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

Unified Diff: src/views/SkViewInflate.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/views/SkView.cpp ('k') | src/views/SkViewPriv.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/SkViewInflate.cpp
diff --git a/src/views/SkViewInflate.cpp b/src/views/SkViewInflate.cpp
index 59cc4813fa5281c142fb331af4afcd62df6766cb..8418fb0e720517dae2cfc0f231827c88993b4c0a 100644
--- a/src/views/SkViewInflate.cpp
+++ b/src/views/SkViewInflate.cpp
@@ -37,10 +37,10 @@ void SkViewInflate::rInflate(const SkDOM& dom, const SkDOM::Node* node, SkView*
const char* name = dom.getName(child);
const char* target;
- if (!strcmp(name, "listenTo") && (target = dom.findAttr(child, "target")) != NULL)
+ if (!strcmp(name, "listenTo") && (target = dom.findAttr(child, "target")) != nullptr)
this->addIDStr(&fListenTo, parent, target);
- if (!strcmp(name, "broadcastTo") && (target = dom.findAttr(child, "target")) != NULL)
+ if (!strcmp(name, "broadcastTo") && (target = dom.findAttr(child, "target")) != nullptr)
this->addIDStr(&fBroadcastTo, parent, target);
}
child = dom.getNextSibling(child);
@@ -62,13 +62,13 @@ SkView* SkViewInflate::inflate(const SkDOM& dom, const SkDOM::Node* node, SkView
{
fIDs.reset();
- if (root == NULL)
+ if (root == nullptr)
{
root = this->createView(dom, node);
- if (root == NULL)
+ if (root == nullptr)
{
- printf("createView returned NULL on <%s>\n", dom.getName(node));
- return NULL;
+ printf("createView returned nullptr on <%s>\n", dom.getName(node));
+ return nullptr;
}
}
this->rInflate(dom, node, root);
@@ -103,21 +103,21 @@ SkView* SkViewInflate::inflate(const char xml[], size_t len, SkView* root)
SkDOM dom;
const SkDOM::Node* node = dom.build(xml, len);
- return node ? this->inflate(dom, node, root) : NULL;
+ return node ? this->inflate(dom, node, root) : nullptr;
}
SkView* SkViewInflate::findViewByID(const char id[]) const
{
SkASSERT(id);
SkView* view;
- return fIDs.find(id, &view) ? view : NULL;
+ return fIDs.find(id, &view) ? view : nullptr;
}
SkView* SkViewInflate::createView(const SkDOM& dom, const SkDOM::Node* node)
{
if (!strcmp(dom.getName(node), "view"))
return new SkView;
- return NULL;
+ return nullptr;
}
void SkViewInflate::addIDStr(SkTDArray<IDStr>* list, SkView* view, const char* str)
« no previous file with comments | « src/views/SkView.cpp ('k') | src/views/SkViewPriv.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698