diff options
Diffstat (limited to 'src/animator/SkAnimator.cpp')
| -rw-r--r-- | src/animator/SkAnimator.cpp | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/animator/SkAnimator.cpp b/src/animator/SkAnimator.cpp index 830f453..c1fba65 100644 --- a/src/animator/SkAnimator.cpp +++ b/src/animator/SkAnimator.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/animator/SkAnimator.cpp -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkAnimator.h" #include "SkAnimateMaker.h" @@ -27,7 +19,7 @@ #include "SkScript2.h" // compiled script experiment #include "SkSystemEventTypes.h" #include "SkTypedArray.h" -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID #include "SkDrawExtraPathEffect.h" #endif #ifdef SK_DEBUG @@ -395,7 +387,7 @@ void SkAnimator::initialize() { SkDELETE(fMaker); fMaker = SkNEW_ARGS(SkAnimateMaker, (this, NULL, NULL)); decodeMemory(gMathPrimer, sizeof(gMathPrimer)-1); -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID InitializeSkExtraPathEffects(this); #endif } @@ -487,7 +479,7 @@ void SkAnimator::onEventPost(SkEvent* evt, SkEventSinkID sinkID) #else SkASSERT(sinkID == this->getSinkID() || this->getHostEventSinkID() == sinkID); #endif - SkEvent::Post(evt, sinkID); + evt->setTargetID(sinkID)->post(); } void SkAnimator::onEventPostTime(SkEvent* evt, SkEventSinkID sinkID, SkMSec time) @@ -501,7 +493,7 @@ void SkAnimator::onEventPostTime(SkEvent* evt, SkEventSinkID sinkID, SkMSec time #else SkASSERT(sinkID == this->getSinkID() || this->getHostEventSinkID() == sinkID); #endif - SkEvent::PostTime(evt, sinkID, time); + evt->setTargetID(sinkID)->postTime(time); } void SkAnimator::reset() { |