| Index: src/core/SkPictureStateTree.cpp
|
| diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
|
| index d2f0e6efcd40299b7425fe6f2afd89804825c13a..704a04ebee962e2fd90fcebc6a6e42d2a440fcc4 100644
|
| --- a/src/core/SkPictureStateTree.cpp
|
| +++ b/src/core/SkPictureStateTree.cpp
|
| @@ -46,7 +46,7 @@ void SkPictureStateTree::appendSaveLayer(size_t offset) {
|
| }
|
|
|
| void SkPictureStateTree::saveCollapsed() {
|
| - SkASSERT(NULL != fLastRestoredNode);
|
| + SkASSERT(fLastRestoredNode);
|
| SkASSERT(SkToBool(fLastRestoredNode->fFlags & \
|
| (Node::kSaveLayer_Flag | Node::kSave_Flag)));
|
| SkASSERT(fLastRestoredNode->fParent == fCurrentState.fNode);
|
| @@ -102,7 +102,7 @@ void SkPictureStateTree::Iterator::init(const SkTDArray<void*>& draws, SkCanvas*
|
| }
|
|
|
| void SkPictureStateTree::Iterator::setCurrentMatrix(const SkMatrix* matrix) {
|
| - SkASSERT(NULL != matrix);
|
| + SkASSERT(matrix);
|
|
|
| if (matrix == fCurrentMatrix) {
|
| return;
|
|
|