| 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);
|
| }
|
|
|