src/animator/SkScript.cpp - Issue 22732004: Fix build with SK_SUPPORT_UNITTEST on

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/animator/SkScript.cpp

Issue 22732004: Fix build with SK_SUPPORT_UNITTEST on (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/animator/SkScript.cpp

diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp

index 14ca6259254d70245f1dec5b1b732af2636dbe5e..c74b195f3a8c7673275104b5122eead18496bd0e 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),

« no previous file with comments | « no previous file | src/animator/SkScriptTokenizer.cpp » ('j') | no next file with comments »