Fix or workaround several issues of slimmingPaintInvalidation on spv1

third_party/WebKit/Source/core/paint/PaintInvalidator.cpp

 // Copyright 2016 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/paint/PaintInvalidator.h"
 
 #include "core/editing/FrameSelection.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 164 matching lines @@
         }
     }
 
     DCHECK(context.paintInvalidationContainer == object.containerForPaintInvalidation());
     DCHECK(context.paintingLayer == object.paintingLayer());
 
     if (object.mayNeedPaintInvalidationSubtree())
         context.forcedSubtreeInvalidationFlags |= PaintInvalidatorContext::ForcedSubtreeInvalidationChecking;
 
     // TODO(crbug.com/637313): This is temporary before we support filters in paint property tree.
-    if (object.hasFilterInducingProperty())
+    // TODO(crbug.com/648274): This is a workaround for multi-column contents.
+    // TODO(crbug.com/648409): This is a workaround for inline contents in vertical-rl container.
+    if (object.hasFilterInducingProperty() || object.isLayoutFlowThread() || object.hasFlippedBlocksWritingMode())
         context.forcedSubtreeInvalidationFlags |= PaintInvalidatorContext::ForcedSubtreeSlowPathRect;
 
     context.oldBounds = object.previousPaintInvalidationRect();
     context.oldLocation = object.previousPositionFromPaintInvalidationBacking();
     context.newBounds = computePaintInvalidationRectInBacking(object, context);
     context.newLocation = computeLocationFromPaintInvalidationBacking(object, context);
 
     IntSize adjustment = object.scrollAdjustmentForPaintInvalidation(*context.paintInvalidationContainer);
     context.newLocation.move(adjustment);
     context.newBounds.move(adjustment);
 
     object.getMutableForPainting().setPreviousPaintInvalidationRect(context.newBounds);
     object.getMutableForPainting().setPreviousPositionFromPaintInvalidationBacking(context.newLocation);
 }
 
 void PaintInvalidator::invalidatePaintIfNeeded(FrameView& frameView, PaintInvalidatorContext& context)
 {
     LayoutView* layoutView = frameView.layoutView();
     CHECK(layoutView);
 
     context.paintInvalidationContainer = context.paintInvalidationContainerForStackedContents = &layoutView->containerForPaintInvalidation();
     context.paintingLayer = layoutView->layer();
 
-    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+        // Undo content clip and scroll before invalidating FrameView scrollbars.
+        PaintPropertyTreeBuilderContext& treeBuilderContext = const_cast<PaintPropertyTreeBuilderContext&>(context.treeBuilderContext);
+        PaintPropertyTreeBuilderContext::ContainingBlockContext savedCurrent = treeBuilderContext.current;
+        if (frameView.contentClip() == savedCurrent.clip)
+            treeBuilderContext.current.clip =  savedCurrent.clip->parent();
+        if (frameView.scroll() == savedCurrent.scroll)
+            treeBuilderContext.current.scroll = savedCurrent.scroll->parent();
+        if (frameView.scrollTranslation() == savedCurrent.transform)
+            treeBuilderContext.current.transform = savedCurrent.transform->parent();
         frameView.invalidatePaintOfScrollControlsIfNeeded(context);
+        treeBuilderContext.current = savedCurrent;
+    }
 
     if (frameView.frame().selection().isCaretBoundsDirty())
         frameView.frame().selection().invalidateCaretRect();
 
     // Temporary callback for crbug.com/487345,402044
     // TODO(ojan): Make this more general to be used by PositionObserver
     // and rAF throttling.
     IntRect visibleRect = frameView.rootFrameToContents(frameView.computeVisibleArea());
     layoutView->sendMediaPositionChangeNotifications(visibleRect);
 }
@@ skipping 64 matching lines @@
     object.getMutableForPainting().clearPaintInvalidationFlags();
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations()
 {
     for (auto target : m_pendingDelayedPaintInvalidations)
         target->getMutableForPainting().setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
 }
 
 } // namespace blink