Trying to be consistent when members are allowed to be NULL

src/core/SkLocalMatrixShader.cpp

Index: src/core/SkLocalMatrixShader.cpp
diff --git a/src/core/SkLocalMatrixShader.cpp b/src/core/SkLocalMatrixShader.cpp
index 62840dd3af63e51a7c5b269fe645488492fd2b43..199628e85b7f17c845288bd8794f94b3f73de5b4 100644
--- a/src/core/SkLocalMatrixShader.cpp
+++ b/src/core/SkLocalMatrixShader.cpp
@@ -60,8 +60,8 @@ void SkLocalMatrixShader::toString(SkString* str) const {
 #endif
 
 SkShader* SkShader::CreateLocalMatrixShader(SkShader* proxy, const SkMatrix& localMatrix) {
-    if (localMatrix.isIdentity()) {
-        return SkRef(proxy);
+    if (localMatrix.isIdentity() || !proxy) {

[sugoi1, 2014/10/29 15:26:12]

proxy may be NULL (see SkRectShaderImageFilter)

[reed1, 2014/10/29 15:43:38]

Would this be even clearer as:

if (NULL == proxy) {
    return NULL;
}
if (localMatrix.identity()) {
    return SkRef(proxy);
}

[sugoi1, 2014/10/29 18:21:00]

Done.

+        return SkSafeRef(proxy);
     }
 
     const SkMatrix* lm = &localMatrix;