Fix paint invalidation rect tracking within composited scrolling layers.

Source/core/layout/LayoutBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 728 matching lines @@
     if (!hasOverflowClip())
         return false;
 
     bool hasScrollableOverflow = hasScrollableOverflowX() || hasScrollableOverflowY();
     if (scrollsOverflow() && hasScrollableOverflow)
         return true;
 
     return node && node->hasEditableStyle();
 }
 
-bool LayoutBox::usesCompositedScrolling() const
-{
-    return hasOverflowClip() && hasLayer() && layer()->scrollableArea()->usesCompositedScrolling();
-}
-
 void LayoutBox::autoscroll(const IntPoint& positionInRootFrame)
 {
     LocalFrame* frame = this->frame();
     if (!frame)
         return;
 
     FrameView* frameView = frame->view();
     if (!frameView)
         return;
 
@@ skipping 631 matching lines @@
             // during DeprecatedPaintLayerScrollableArea::invalidateScrollbarRect(). However, for now we still need to
             // invalidate the rectangles to trigger repaints.
             if (area->hasVerticalBarDamage())
                 invalidatePaintRectangleNotInvalidatingDisplayItemClients(LayoutRect(area->verticalBarDamage()));
             if (area->hasHorizontalBarDamage())
                 invalidatePaintRectangleNotInvalidatingDisplayItemClients(LayoutRect(area->horizontalBarDamage()));
         }
     }
 
     // This is for the next invalidatePaintIfNeeded so must be at the end.
-    savePreviousBoxSizesIfNeeded();
+    savePreviousBoxSizesIfNeeded(newPaintInvalidationContainer);
     return reason;
 }
 
 void LayoutBox::clearPaintInvalidationState(const PaintInvalidationState& paintInvalidationState)
 {
     LayoutBoxModelObject::clearPaintInvalidationState(paintInvalidationState);
 
     if (ScrollableArea* area = scrollableArea())
         area->resetScrollbarDamage();
 }
@@ skipping 3157 matching lines @@
     return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
 }
 
 void LayoutBox::setPageLogicalOffset(LayoutUnit offset)
 {
     if (!m_rareData && !offset)
         return;
     ensureRareData().m_pageLogicalOffset = offset;
 }
 
-bool LayoutBox::needToSavePreviousBoxSizes()
+bool LayoutBox::needToSavePreviousBoxSizes(const LayoutBoxModelObject& paintInvalidationContainer)
 {
     // If m_rareData is already created, always save.
     if (m_rareData)
         return true;
 
-    LayoutSize paintInvalidationSize = previousPaintInvalidationRect().size();
+    LayoutSize paintInvalidationSize = previousPaintInvalidationRectIncludingCompositedScrolling(paintInvalidationContainer).size();
     // Don't save old box sizes if the paint rect is empty because we'll
     // full invalidate once the paint rect becomes non-empty.
     if (paintInvalidationSize.isEmpty())
         return false;
 
     // We need the old box sizes only when the box has background, decorations, or masks.
     // Main LayoutView paints base background, thus interested in box size.
     if (!isLayoutView() && !style()->hasBackground() && !style()->hasBoxDecorations() && !style()->hasMask())
         return false;
 
     // No need to save old border box size if we can use size of the old paint
     // rect as the old border box size in the next invalidation.
     if (paintInvalidationSize != size())
         return true;
 
     // Background and mask layers can depend on other boxes than border box. See crbug.com/490533
     if (style()->backgroundLayers().thisOrNextLayersUseContentBox() || style()->backgroundLayers().thisOrNextLayersHaveLocalAttachment()
         || style()->maskLayers().thisOrNextLayersUseContentBox())
         return true;
 
     return false;
 }
 
-void LayoutBox::savePreviousBoxSizesIfNeeded()
+void LayoutBox::savePreviousBoxSizesIfNeeded(const LayoutBoxModelObject& paintInvalidationContainer)
 {
-    if (!needToSavePreviousBoxSizes())
+    if (!needToSavePreviousBoxSizes(paintInvalidationContainer))
         return;
 
     LayoutBoxRareData& rareData = ensureRareData();
     rareData.m_previousBorderBoxSize = size();
     rareData.m_previousContentBoxRect = contentBoxRect();
     rareData.m_previousLayoutOverflowRect = layoutOverflowRect();
 }
 
 LayoutSize LayoutBox::computePreviousBorderBoxSize(const LayoutSize& previousBoundsSize) const
 {
@@ skipping 116 matching lines @@
     StyleImage* borderImage = style()->borderImage().image();
     return borderImage && borderImage->canRender(*this, style()->effectiveZoom()) && borderImage->isLoaded();
 }
 
 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const
 {
     return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
 }
 
 } // namespace blink