Fix build with SK_SUPPORT_UNITTEST on

Fix build with SK_SUPPORT_UNITTEST on. Parenthesis with && and || is
fixed similarly to r1386.

BUG=skia:1493
R=scroggo@google.com

Author: kkinnunen@nvidia.com

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

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

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),

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;