LayoutObject::paintingLayer() to correctly handle column-span:all

third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/PaintInvalidationState.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutPart.h"
@@ skipping 21 matching lines @@
     , m_forcedSubtreeInvalidationWithinContainer(false)
     , m_forcedSubtreeInvalidationRectUpdateWithinContainer(false)
     , m_clipped(false)
     , m_clippedForAbsolutePosition(false)
     , m_cachedOffsetsEnabled(true)
     , m_cachedOffsetsForAbsolutePositionEnabled(true)
     , m_paintInvalidationContainer(&layoutView.containerForPaintInvalidation())
     , m_paintInvalidationContainerForStackedContents(m_paintInvalidationContainer)
     , m_containerForAbsolutePosition(layoutView)
     , m_pendingDelayedPaintInvalidations(pendingDelayedPaintInvalidations)
-    , m_enclosingSelfPaintingLayer(*layoutView.layer())
+    , m_paintingLayer(*layoutView.layer())
 #if ENABLE(ASSERT)
     , m_didUpdateForChildren(false)
 #endif
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
     , m_canCheckFastPathSlowPathEquality(layoutView == m_paintInvalidationContainer)
 #endif
 {
     if (!supportsCachedOffsets(layoutView)) {
         m_cachedOffsetsEnabled = false;
         return;
@@ skipping 14 matching lines @@
     , m_clipRectForAbsolutePosition(parentState.m_clipRectForAbsolutePosition)
     , m_paintOffset(parentState.m_paintOffset)
     , m_paintOffsetForAbsolutePosition(parentState.m_paintOffsetForAbsolutePosition)
     , m_cachedOffsetsEnabled(parentState.m_cachedOffsetsEnabled)
     , m_cachedOffsetsForAbsolutePositionEnabled(parentState.m_cachedOffsetsForAbsolutePositionEnabled)
     , m_paintInvalidationContainer(parentState.m_paintInvalidationContainer)
     , m_paintInvalidationContainerForStackedContents(parentState.m_paintInvalidationContainerForStackedContents)
     , m_containerForAbsolutePosition(currentObject.canContainAbsolutePositionObjects() ? currentObject : parentState.m_containerForAbsolutePosition)
     , m_svgTransform(parentState.m_svgTransform)
     , m_pendingDelayedPaintInvalidations(parentState.pendingDelayedPaintInvalidationTargets())
-    , m_enclosingSelfPaintingLayer(parentState.enclosingSelfPaintingLayer(currentObject))
+    , m_paintingLayer(currentObject.hasLayer() && toLayoutBoxModelObject(currentObject).hasSelfPaintingLayer() ? *toLayoutBoxModelObject(currentObject).layer() : parentState.m_paintingLayer)
 #if ENABLE(ASSERT)
     , m_didUpdateForChildren(false)
 #endif
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
     , m_canCheckFastPathSlowPathEquality(parentState.m_canCheckFastPathSlowPathEquality)
 #endif
 {
+    ASSERT(&m_paintingLayer == currentObject.paintingLayer());
+
     if (currentObject == parentState.m_currentObject) {
         // Sometimes we create a new PaintInvalidationState from parentState on the same object
         // (e.g. LayoutView, and the HorriblySlowRectMapping cases in LayoutBlock::invalidatePaintOfSubtreesIfNeeded()).
         // TODO(wangxianzhu): Avoid this for RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled().
 #if ENABLE(ASSERT)
         m_didUpdateForChildren = parentState.m_didUpdateForChildren;
 #endif
         return;
     }
 
@@ skipping 313 matching lines @@
     LayoutRect clipRect = localClipRect;
     clipRect.move(m_paintOffset);
     if (m_clipped) {
         m_clipRect.intersect(clipRect);
     } else {
         m_clipRect = clipRect;
         m_clipped = true;
     }
 }
 
-PaintLayer& PaintInvalidationState::enclosingSelfPaintingLayer(const LayoutObject& layoutObject) const
+PaintLayer& PaintInvalidationState::paintingLayer() const
 {
-    if (layoutObject.hasLayer() && toLayoutBoxModelObject(layoutObject).hasSelfPaintingLayer())
-        return *toLayoutBoxModelObject(layoutObject).layer();
-
-    return m_enclosingSelfPaintingLayer;
+    ASSERT(&m_paintingLayer == m_currentObject.paintingLayer());
+    return m_paintingLayer;
 }
 
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
 
 static bool mayHaveBeenSaturated(LayoutUnit value)
 {
     // This is not accurate, just to avoid too big values.
     return value.abs() >= LayoutUnit::max() / 2;
 }
 
@@ skipping 35 matching lines @@
     WTFLogAlways("Fast path paint invalidation rect differs from slow path: fast: %s vs slow: %s",
         fastPathRect.toString().ascii().data(), slowPathRect.toString().ascii().data());
     showLayoutTree(&m_currentObject);
 
     ASSERT_NOT_REACHED();
 }
 
 #endif // CHECK_FAST_PATH_SLOW_PATH_EQUALITY
 
 } // namespace blink