diff options
| author | Chris Craik <ccraik@google.com> | 2011-11-30 10:50:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 10:50:43 -0800 |
| commit | ed5d84ae70b5ff966ed7a934d5658f6648088d30 (patch) | |
| tree | ccdbc1b22881ea9f7347cf29e24598faeaa6403d /Source/WebCore/rendering | |
| parent | c75d89bc16f0cf638347ee3348f782b8309d8be3 (diff) | |
| parent | 807ee5ec662a7864dee505040ade9a9b3eab143c (diff) | |
| download | external_webkit-ed5d84ae70b5ff966ed7a934d5658f6648088d30.zip external_webkit-ed5d84ae70b5ff966ed7a934d5658f6648088d30.tar.gz external_webkit-ed5d84ae70b5ff966ed7a934d5658f6648088d30.tar.bz2 | |
am 807ee5ec: Merge "synchronize animation starts with webkit" into ics-mr1
* commit '807ee5ec662a7864dee505040ade9a9b3eab143c':
synchronize animation starts with webkit
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index 85c57a6..06fa0f6 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -1578,7 +1578,12 @@ bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* render return false; if (AnimationController* animController = renderer->animation()) { +#if PLATFORM(ANDROID) + // android renders an opacity animation much faster if it's composited + return (animController->isRunningAnimationOnRenderer(renderer, CSSPropertyOpacity)) +#else return (animController->isRunningAnimationOnRenderer(renderer, CSSPropertyOpacity) && inCompositingMode()) +#endif || animController->isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform); } return false; |