Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / core / SkTDynamicHash.h

diff --git a/src/third_party/skia/src/core/SkTDynamicHash.h b/src/third_party/skia/src/core/SkTDynamicHash.h
index 496dc8d..23544c8 100644 (file)
--- a/src/third_party/skia/src/core/SkTDynamicHash.h
+++ b/src/third_party/skia/src/core/SkTDynamicHash.h
@@ -114,13 +114,13 @@ public:
 
     // Remove the entry with this key.  We require that an entry with this key is present.
     void remove(const Key& key) {
-        SkASSERT(NULL != this->find(key));
+        SkASSERT(this->find(key));
         this->innerRemove(key);
         SkASSERT(this->validate());
     }
 
     void rewind() {
-        if (NULL != fArray) {
+        if (fArray) {
             sk_bzero(fArray, sizeof(T*)* fCapacity);
         }
         fCount = 0;
@@ -177,7 +177,7 @@ private:
                     deleted++;
                 } else if (Empty() != fArray[i]) {
                     count++;
-                    SKTDYNAMICHASH_CHECK(NULL != this->find(GetKey(*fArray[i])));
+                    SKTDYNAMICHASH_CHECK(this->find(GetKey(*fArray[i])));
                 }
             }
             SKTDYNAMICHASH_CHECK(count == fCount);