summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/RenderLayerCompositor.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-11-22 16:06:08 -0800
committerChris Craik <ccraik@google.com>2011-11-22 16:06:08 -0800
commit3eaf0f8cdb150a43732c8391a73046811b3c378d (patch)
tree442255d5be10602b823e5f14f5a3536d3db33c93 /Source/WebCore/rendering/RenderLayerCompositor.cpp
parentbd996ca3728f985d3fee81471268643ca772ed40 (diff)
downloadexternal_webkit-3eaf0f8cdb150a43732c8391a73046811b3c378d.zip
external_webkit-3eaf0f8cdb150a43732c8391a73046811b3c378d.tar.gz
external_webkit-3eaf0f8cdb150a43732c8391a73046811b3c378d.tar.bz2
Force layers above overscroll/fixed elements to composite
bug:5480098 This fixes the case where they were drawn on the base layer, beneath overscroll elements. Change-Id: If9dda8c3a25cf38e777847b834ae02ec530a8000
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerCompositor.cpp')
-rw-r--r--Source/WebCore/rendering/RenderLayerCompositor.cpp8
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.