(WIP) Paint invalidation for slimming paint v2

Source/core/paint/BlockPainter.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 "config.h"
 #include "core/paint/BlockPainter.h"
 
 #include "core/editing/DragCaretController.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/Settings.h"
@@ skipping 10 matching lines @@
 #include "core/paint/PaintInfo.h"
 #include "core/paint/ScopeRecorder.h"
 #include "core/paint/ScrollRecorder.h"
 #include "core/paint/ScrollableAreaPainter.h"
 #include "core/paint/SubtreeRecorder.h"
 #include "platform/graphics/paint/ClipRecorder.h"
 #include "wtf/Optional.h"
 
 namespace blink {
 
+static inline LayoutRect visualOverflowRectWithPaintOffset(const LayoutBlock& layoutBox, const LayoutPoint& paintOffset)
+{
+    if (!RuntimeEnabledFeatures::slimmingPaintEnabled())
+        return LayoutRect();
+    LayoutRect bounds = layoutBox.visualOverflowRect();
+    bounds.moveBy(paintOffset);
+    return bounds;
+}
+
 void BlockPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     PaintInfo localPaintInfo(paintInfo);
 
     LayoutPoint adjustedPaintOffset = paintOffset + m_layoutBlock.location();
 
     PaintPhase originalPhase = localPaintInfo.phase;
 
     // Check if we need to do anything at all.
     LayoutRect overflowBox = overflowRectForPaintRejection();
     m_layoutBlock.flipForWritingMode(overflowBox);
     overflowBox.moveBy(adjustedPaintOffset);
     if (!overflowBox.intersects(LayoutRect(localPaintInfo.rect)))
         return;
 
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        m_layoutBlock.invalidatePaintIfNeededForSlimmingPaintV2(adjustedPaintOffset);
+
     SubtreeRecorder subtreeRecorder(*paintInfo.context, m_layoutBlock, paintInfo.phase);
     if (subtreeRecorder.canUseCache())
         return;
 
     // There are some cases where not all clipped visual overflow is accounted for.
     // FIXME: reduce the number of such cases.
     ContentsClipBehavior contentsClipBehavior = ForceContentsClip;
     if (m_layoutBlock.hasOverflowClip() && !m_layoutBlock.hasControlClip() && !(m_layoutBlock.shouldPaintSelectionGaps() && originalPhase == PaintPhaseForeground) && !hasCaret())
         contentsClipBehavior = SkipContentsClipIfPossible;
 
@@ skipping 88 matching lines @@
         layoutObject.paint(info, childPoint);
         info.phase = PaintPhaseFloat;
         layoutObject.paint(info, childPoint);
         info.phase = PaintPhaseForeground;
         layoutObject.paint(info, childPoint);
         info.phase = PaintPhaseOutline;
         layoutObject.paint(info, childPoint);
     }
 }
 
-static inline LayoutRect visualOverflowRectWithPaintOffset(const LayoutBlock& layoutBox, const LayoutPoint& paintOffset)
-{
-    if (!RuntimeEnabledFeatures::slimmingPaintEnabled())
-        return LayoutRect();
-    LayoutRect bounds = layoutBox.visualOverflowRect();
-    bounds.moveBy(paintOffset);
-    return bounds;
-}
-
 void BlockPainter::paintObject(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     const PaintPhase paintPhase = paintInfo.phase;
 
     if ((paintPhase == PaintPhaseBlockBackground || paintPhase == PaintPhaseChildBlockBackground)
         && m_layoutBlock.style()->visibility() == VISIBLE
         && m_layoutBlock.hasBoxDecorationBackground())
         m_layoutBlock.paintBoxDecorationBackground(paintInfo, paintOffset);
 
     if (paintPhase == PaintPhaseMask && m_layoutBlock.style()->visibility() == VISIBLE) {
@@ skipping 170 matching lines @@
         LayoutBlock* block = flow->containingBlock();
         for ( ; block && block != &m_layoutBlock; block = block->containingBlock())
             accumulatedPaintOffset.moveBy(block->location());
         ASSERT(block);
         InlinePainter(*flow).paintOutline(info, accumulatedPaintOffset);
     }
 }
 
 
 } // namespace blink