| Index: Source/WebCore/rendering/RenderLayer.cpp
|
| ===================================================================
|
| --- Source/WebCore/rendering/RenderLayer.cpp (revision 104364)
|
| +++ Source/WebCore/rendering/RenderLayer.cpp (working copy)
|
| @@ -4070,14 +4070,9 @@
|
| if (!isStackingContext() || !m_zOrderListsDirty)
|
| return;
|
|
|
| -#if USE(ACCELERATED_COMPOSITING)
|
| - bool includeHiddenLayers = compositor()->inCompositingMode();
|
| -#else
|
| - bool includeHiddenLayers = false;
|
| -#endif
|
| for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
|
| if (!m_reflection || reflectionLayer() != child)
|
| - child->collectLayers(includeHiddenLayers, m_posZOrderList, m_negZOrderList);
|
| + child->collectLayers(m_posZOrderList, m_negZOrderList);
|
|
|
| // Sort the two lists.
|
| if (m_posZOrderList)
|
| @@ -4106,13 +4101,12 @@
|
| m_normalFlowListDirty = false;
|
| }
|
|
|
| -void RenderLayer::collectLayers(bool includeHiddenLayers, Vector<RenderLayer*>*& posBuffer, Vector<RenderLayer*>*& negBuffer)
|
| +void RenderLayer::collectLayers(Vector<RenderLayer*>*& posBuffer, Vector<RenderLayer*>*& negBuffer)
|
| {
|
| updateVisibilityStatus();
|
|
|
| // Overflow layers are just painted by their enclosing layers, so they don't get put in zorder lists.
|
| - bool includeHiddenLayer = includeHiddenLayers || (m_hasVisibleContent || (m_hasVisibleDescendant && isStackingContext()));
|
| - if (includeHiddenLayer && !isNormalFlowOnly() && !renderer()->isRenderFlowThread()) {
|
| + if ((m_hasVisibleContent || (m_hasVisibleDescendant && isStackingContext())) && !isNormalFlowOnly() && !renderer()->isRenderFlowThread()) {
|
| // Determine which buffer the child should be in.
|
| Vector<RenderLayer*>*& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
|
|
|
| @@ -4126,11 +4120,11 @@
|
|
|
| // Recur into our children to collect more layers, but only if we don't establish
|
| // a stacking context.
|
| - if ((includeHiddenLayers || m_hasVisibleDescendant) && !isStackingContext()) {
|
| + if (m_hasVisibleDescendant && !isStackingContext()) {
|
| for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
|
| // Ignore reflections.
|
| if (!m_reflection || reflectionLayer() != child)
|
| - child->collectLayers(includeHiddenLayers, posBuffer, negBuffer);
|
| + child->collectLayers(posBuffer, negBuffer);
|
| }
|
| }
|
| }
|
|
|