diff options
| author | Chris Craik <ccraik@google.com> | 2011-11-23 10:44:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-23 10:44:36 -0800 |
| commit | 23166ff25c873649b9c919b0672449251b23db3c (patch) | |
| tree | dc2e613f1d5a725b48c71dffb4f8b7932877f9e7 /Source/WebCore/rendering | |
| parent | 2a01e2835a55e53ad23a370327f5c887d306a8f0 (diff) | |
| parent | 3eaf0f8cdb150a43732c8391a73046811b3c378d (diff) | |
| download | external_webkit-23166ff25c873649b9c919b0672449251b23db3c.zip external_webkit-23166ff25c873649b9c919b0672449251b23db3c.tar.gz external_webkit-23166ff25c873649b9c919b0672449251b23db3c.tar.bz2 | |
am 3eaf0f8c: Force layers above overscroll/fixed elements to composite
* commit '3eaf0f8cdb150a43732c8391a73046811b3c378d':
Force layers above overscroll/fixed elements to composite
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index fdf8270..5827636 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -724,15 +724,7 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* layer, O if (layer->isFixed()) compositingState.m_hasFixedElement = true; #endif - -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - // we don't want to signal that the subtree is compositing if the reason - // is because the layer is an overflow layer -- doing so would trigger - // all the above layers to be composited unnecessarily - if (willBeComposited && !layer->hasOverflowScroll() && !layer->isFixed()) { -#else if (willBeComposited) { -#endif // Tell the parent it has compositing descendants. compositingState.m_subtreeIsCompositing = true; // This layer now acts as the ancestor for kids. |