diff options
Diffstat (limited to 'src/animator')
| -rw-r--r-- | src/animator/SkAnimator.cpp | 4 | ||||
| -rw-r--r-- | src/animator/SkScriptTokenizer.cpp | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/animator/SkAnimator.cpp b/src/animator/SkAnimator.cpp index 09fccd925d..acbb808c5c 100644 --- a/src/animator/SkAnimator.cpp +++ b/src/animator/SkAnimator.cpp @@ -409,9 +409,9 @@ bool SkAnimator::onEvent(const SkEvent& evt) { #endif if (evt.isType(SK_EventType_OnEnd)) { SkEventState eventState; - bool success = evt.findPtr("anim", (void**) &eventState.fDisplayable); + SkDEBUGCODE(bool success =) evt.findPtr("anim", (void**) &eventState.fDisplayable); SkASSERT(success); - success = evt.findS32("time", (int32_t*) &fMaker->fEnableTime); + SkDEBUGCODE(success =) evt.findS32("time", (int32_t*) &fMaker->fEnableTime); SkASSERT(success); fMaker->fAdjustedStart = fMaker->getAppTime() - fMaker->fEnableTime; fMaker->fEvents.doEvent(*fMaker, SkDisplayEvent::kOnEnd, &eventState); diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp index ca6cab0d34..b11c0a575c 100644 --- a/src/animator/SkScriptTokenizer.cpp +++ b/src/animator/SkScriptTokenizer.cpp @@ -603,8 +603,6 @@ scalarCommon: } if (ch == '.') { if (fTokenLength == 0) { - SkDEBUGCODE(SkScriptValue2 scriptValue;) - SkDEBUGCODE(scriptValue.fOperand.fObject = NULL); int tokenLength = token_length(++script); const char* token = script; script += tokenLength; @@ -1273,6 +1271,7 @@ bool SkScriptEngine2::ValueToString(const SkScriptValue2& value, SkString* strin } #ifdef SK_DEBUG +#if defined(SK_SUPPORT_UNITTEST) #define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL } #ifdef SK_SCALAR_IS_FLOAT @@ -1475,6 +1474,7 @@ static const SkScriptNAnswer2 scriptTests[] = { }; #define SkScriptNAnswer_testCount SK_ARRAY_COUNT(scriptTests) +#endif // SK_SUPPORT_UNITTEST void SkScriptEngine2::UnitTest() { #if defined(SK_SUPPORT_UNITTEST) @@ -1506,6 +1506,7 @@ void SkScriptEngine2::UnitTest() { SkASSERT(0); } } -#endif +#endif // SK_SUPPORT_UNITTEST } -#endif +#endif // SK_DEBUG + |