diff options
| author | Chris Craik <ccraik@google.com> | 2011-11-29 16:55:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-29 16:55:45 -0800 |
| commit | 807ee5ec662a7864dee505040ade9a9b3eab143c (patch) | |
| tree | a0c2b48fac1eca4234935674119f3ef5a74bbe6d /Source/WebCore/rendering | |
| parent | 06081e3d5c78c73256b49c85d05e7c41d9e2b6f1 (diff) | |
| parent | aeca53d3fee2e94ce013c1dc12648f0335284fbb (diff) | |
| download | external_webkit-807ee5ec662a7864dee505040ade9a9b3eab143c.zip external_webkit-807ee5ec662a7864dee505040ade9a9b3eab143c.tar.gz external_webkit-807ee5ec662a7864dee505040ade9a9b3eab143c.tar.bz2 | |
Merge "synchronize animation starts with webkit" into ics-mr1
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; |