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

Unified Diff: src/views/SkViewPriv.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/SkViewInflate.cpp ('k') | src/views/SkWidgets.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/SkViewPriv.cpp
diff --git a/src/views/SkViewPriv.cpp b/src/views/SkViewPriv.cpp
index 6d908145742ff35184d6d456c06edc645a07bfa0..03541fd7ad29883adbed1cf485ec9dbc913b7fea 100644
--- a/src/views/SkViewPriv.cpp
+++ b/src/views/SkViewPriv.cpp
@@ -29,14 +29,14 @@ void SkView::Artist::onInflate(const SkDOM&, const SkDOM::Node*)
SkView::Artist* SkView::getArtist() const
{
Artist_SkTagList* rec = (Artist_SkTagList*)this->findTagList(kViewArtist_SkTagList);
- SkASSERT(rec == NULL || rec->fArtist != NULL);
+ SkASSERT(rec == nullptr || rec->fArtist != nullptr);
- return rec ? rec->fArtist : NULL;
+ return rec ? rec->fArtist : nullptr;
}
SkView::Artist* SkView::setArtist(Artist* obj)
{
- if (obj == NULL)
+ if (obj == nullptr)
{
this->removeTagList(kViewArtist_SkTagList);
}
@@ -75,14 +75,14 @@ void SkView::Layout::onInflate(const SkDOM&, const SkDOM::Node*)
SkView::Layout* SkView::getLayout() const
{
Layout_SkTagList* rec = (Layout_SkTagList*)this->findTagList(kViewLayout_SkTagList);
- SkASSERT(rec == NULL || rec->fLayout != NULL);
+ SkASSERT(rec == nullptr || rec->fLayout != nullptr);
- return rec ? rec->fLayout : NULL;
+ return rec ? rec->fLayout : nullptr;
}
SkView::Layout* SkView::setLayout(Layout* obj, bool invokeLayoutNow)
{
- if (obj == NULL)
+ if (obj == nullptr)
{
this->removeTagList(kViewLayout_SkTagList);
}
« no previous file with comments | « src/views/SkViewInflate.cpp ('k') | src/views/SkWidgets.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698