diff options
Diffstat (limited to 'src/animator')
| -rw-r--r-- | src/animator/SkScript.cpp | 12 | ||||
| -rw-r--r-- | src/animator/SkScriptTokenizer.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp index 14ca625925..c74b195f3a 100644 --- a/src/animator/SkScript.cpp +++ b/src/animator/SkScript.cpp @@ -1840,12 +1840,12 @@ static const SkScriptNAnswer scriptTests[] = { // logic testInt(1?2:3), testInt(0?2:3), - testInt(1&&2||3), - testInt(1&&0||3), - testInt(1&&0||0), - testInt(1||0&&3), - testInt(0||0&&3), - testInt(0||1&&3), + testInt((1&&2)||3), + testInt((1&&0)||3), + testInt((1&&0)||0), + testInt(1||(0&&3)), + testInt(0||(0&&3)), + testInt(0||(1&&3)), testInt(1?(2?3:4):5), testInt(0?(2?3:4):5), testInt(1?(0?3:4):5), diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp index f789d388a7..42954a7706 100644 --- a/src/animator/SkScriptTokenizer.cpp +++ b/src/animator/SkScriptTokenizer.cpp @@ -1479,7 +1479,7 @@ static const SkScriptNAnswer2 scriptTests[] = { void SkScriptEngine2::UnitTest() { #if defined(SK_SUPPORT_UNITTEST) ValidateDecompileTable(); - for (int index = 0; index < SkScriptNAnswer_testCount; index++) { + for (size_t index = 0; index < SkScriptNAnswer_testCount; index++) { SkScriptEngine2 engine(scriptTests[index].fType); SkScriptValue2 value; const char* script = scriptTests[index].fScript; |