| Index: include/core/SkTLazy.h
|
| diff --git a/include/core/SkTLazy.h b/include/core/SkTLazy.h
|
| index a291e22a137692226425776dc9efaafb860836bb..a1dc0013fc5b27ea1d6018f8e2938a68e2f30697 100644
|
| --- a/include/core/SkTLazy.h
|
| +++ b/include/core/SkTLazy.h
|
| @@ -88,7 +88,7 @@ public:
|
| * Returns true if a valid object has been initialized in the SkTLazy,
|
| * false otherwise.
|
| */
|
| - bool isValid() const { return NULL != fPtr; }
|
| + bool isValid() const { return SkToBool(fPtr); }
|
|
|
| /**
|
| * Returns the object. This version should only be called when the caller
|
| @@ -166,7 +166,7 @@ public:
|
| * Returns a writable T*. The first time this is called the initial object is cloned.
|
| */
|
| T* writable() {
|
| - SkASSERT(NULL != fObj);
|
| + SkASSERT(fObj);
|
| if (!fLazy.isValid()) {
|
| fLazy.set(*fObj);
|
| fObj = fLazy.get();
|
|
|