Clang has stricter checking for conversion to a null pointer. In C++11 mode, false...

R=reed@google.com, robertphillips@google.com

Author: rtrieu@google.com

Review URL: https://chromiumcodereview.appspot.com/18118004

git-svn-id: http://skia.googlecode.com/svn/trunk@9800 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/animator/SkAnimatorScript.cpp b/src/animator/SkAnimatorScript.cpp
index 67c53c7..df2e563 100644 (file)
--- a/src/animator/SkAnimatorScript.cpp
+++ b/src/animator/SkAnimatorScript.cpp
@@ -165,7 +165,7 @@ bool SkAnimatorScript::EvalID(const char* token, size_t len, void* user, SkScrip
         displayable = engine->fWorking;
         if (SK_LITERAL_STR_EQUAL("parent", token, len)) {
             SkDisplayable* parent = displayable->getParent();
-            if (parent == false)
+            if (parent == NULL)
                 parent = engine->fParent;
             if (parent) {
                 value->fOperand.fDisplayable = parent;

diff --git a/src/animator/SkScriptRuntime.cpp b/src/animator/SkScriptRuntime.cpp
index f287850..061847e 100644 (file)
--- a/src/animator/SkScriptRuntime.cpp
+++ b/src/animator/SkScriptRuntime.cpp
@@ -200,13 +200,13 @@ bool SkScriptRuntime::executeTokens(unsigned char* opCode) {
             operand[0].fScalar = SkScriptEngine2::IntToScalar(operand[op - SkScriptEngine2::kIntToScalar].fS32);
             break;
         case SkScriptEngine2::kStringToInt:
-            if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == false)
+            if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == NULL)
                 return false;
             break;
         case SkScriptEngine2::kStringToScalar:
         case SkScriptEngine2::kStringToScalar2:
             if (SkParse::FindScalar(operand[0].fString->c_str(),
-                    &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == false)
+                    &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == NULL)
                 return false;
             break;
         case SkScriptEngine2::kScalarToInt: