diff options
| author | Chris Craik <ccraik@google.com> | 2011-11-29 13:39:24 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-11-29 16:04:54 -0800 |
| commit | aeca53d3fee2e94ce013c1dc12648f0335284fbb (patch) | |
| tree | 1266a41af9814431faff681061f573987afda7ac /Source/WebCore/rendering | |
| parent | 9c0e7d80ade0cc9bbe087838232cd0877fa01a98 (diff) | |
| download | external_webkit-aeca53d3fee2e94ce013c1dc12648f0335284fbb.zip external_webkit-aeca53d3fee2e94ce013c1dc12648f0335284fbb.tar.gz external_webkit-aeca53d3fee2e94ce013c1dc12648f0335284fbb.tar.bz2 | |
synchronize animation starts with webkit
bug:5239801
this better supports animations not synchronous with webkit
Relies on the frameworks/base CL: https://android-git.corp.google.com/g/#/c/152533/
Change-Id: Ia79a475065b3891db8fc4014559062ab1ac95ebe
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; |