diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-04-07 11:20:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-07 11:20:26 -0700 |
| commit | 18fc0da04d6b91cb211517108c1997dd359528a9 (patch) | |
| tree | 2db43507b8de10935dbf8b2f7defaec5e4aa9b86 /WebCore | |
| parent | f4624395f10bf72eae12ad015bc1663f0e44cbd8 (diff) | |
| parent | 0c7363393334265c29401d7f6967347ce7e7f1ae (diff) | |
| download | external_webkit-18fc0da04d6b91cb211517108c1997dd359528a9.zip external_webkit-18fc0da04d6b91cb211517108c1997dd359528a9.tar.gz external_webkit-18fc0da04d6b91cb211517108c1997dd359528a9.tar.bz2 | |
am 0c736339: Only allow animations computed on the UI if we have two steps -- otherwise let webkit do it.
Merge commit '0c7363393334265c29401d7f6967347ce7e7f1ae' into froyo-plus-aosp
* commit '0c7363393334265c29401d7f6967347ce7e7f1ae':
Only allow animations computed on the UI if we have two steps -- otherwise let webkit do it.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index fa4a180..b8a3610 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -535,7 +535,7 @@ bool GraphicsLayerAndroid::addAnimation(const KeyframeValueList& valueList, const String& keyframesName, double beginTime) { - if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2) + if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() != 2) return false; bool createdAnimations = false; |