Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / core / SkPictureStateTree.cpp

diff --git a/src/third_party/skia/src/core/SkPictureStateTree.cpp b/src/third_party/skia/src/core/SkPictureStateTree.cpp
index d2f0e6e..704a04e 100644 (file)
--- a/src/third_party/skia/src/core/SkPictureStateTree.cpp
+++ b/src/third_party/skia/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;