commit 2dc8b96230c99cd460c02fdb69b036905d072216
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 14 11:36:27 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 14 11:36:27 2013 +0000
tree 30ef261a9e183a0b647ccba52b6612f436e26ae2
parent 9677a84b4055ab084b2aae6adeab31ab1c7a95b7

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

diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp
index 14ca625..c74b195 100644
--- a/src/animator/SkScript.cpp
+++ b/src/animator/SkScript.cpp
@@ -1840,12 +1840,12 @@
     // 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),