diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-04-01 11:09:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-01 11:09:03 -0700 |
| commit | 9a9dfdf630fff8588f6b9fd75d55d67c4e95507e (patch) | |
| tree | f58e14a4b3c317d78f5f207ababc27e1381ac408 | |
| parent | 3ad4951f3276d91e09dc3f00b01af4412bb36346 (diff) | |
| parent | e7c63dbaf937c9e5d6496718538831e481fd4c7e (diff) | |
| download | external_webkit-9a9dfdf630fff8588f6b9fd75d55d67c4e95507e.zip external_webkit-9a9dfdf630fff8588f6b9fd75d55d67c4e95507e.tar.gz external_webkit-9a9dfdf630fff8588f6b9fd75d55d67c4e95507e.tar.bz2 | |
am e7c63dba: am ca84feeb: Merge "Fix animations bug" into honeycomb-mr1
* commit 'e7c63dbaf937c9e5d6496718538831e481fd4c7e':
Fix animations bug
| -rw-r--r-- | WebCore/platform/graphics/android/AndroidAnimation.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/AndroidAnimation.cpp b/WebCore/platform/graphics/android/AndroidAnimation.cpp index 199db53..be9e0ee 100644 --- a/WebCore/platform/graphics/android/AndroidAnimation.cpp +++ b/WebCore/platform/graphics/android/AndroidAnimation.cpp @@ -230,6 +230,11 @@ bool AndroidOpacityAnimation::evaluate(LayerAndroid* layer, double time) if (progress < 0) // we still want to be evaluated until we get progress > 0 return true; + if (progress >= 1) { + m_finished = true; + return false; + } + // First, we need to get the from and to values int from, to; @@ -293,6 +298,11 @@ bool AndroidTransformAnimation::evaluate(LayerAndroid* layer, double time) if (progress < 0) // we still want to be evaluated until we get progress > 0 return true; + if (progress >= 1) { + m_finished = true; + return false; + } + IntSize size(layer->getSize().width(), layer->getSize().height()); TransformationMatrix matrix; XLOG("Evaluate transforms animations, %d operations, progress %.2f for layer %d (%d, %d)" |