Revert of Fix several corner case issues of scrollbar paint invalidation

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

Index: third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
index 94168ae109b119a24206173229e2de3df6d1952b..8b1831a065130648a8329c5998bcbce4a11851fa 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
@@ -12,7 +12,6 @@
 #include "core/layout/LayoutScrollbarPart.h"
 #include "core/layout/PaintInvalidationState.h"
 #include "core/paint/PaintLayer.h"
-#include "platform/graphics/GraphicsLayer.h"
 
 namespace blink {
 
@@ -25,81 +24,37 @@
     ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
 }
 
-static LayoutRect scrollControlPaintInvalidationRect(const IntRect& scrollControlRect, const LayoutBox& box, const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
+// Returns true if the scroll control is invalidated.
+static bool invalidatePaintOfScrollControlIfNeeded(const IntRect& scrollControlRect, LayoutRect& previousPaintInvalidationRect, bool needsPaintInvalidation, LayoutBox& box, const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
 {
     LayoutRect paintInvalidationRect(scrollControlRect);
     if (!paintInvalidationRect.isEmpty())
         PaintLayer::mapRectToPaintInvalidationBacking(&box, &paintInvalidationContainer, paintInvalidationRect, &paintInvalidationState);
-    return paintInvalidationRect;
-}
 
-// Returns true if the scroll control is invalidated.
-static bool invalidatePaintOfScrollControlIfNeeded(const LayoutRect& newPaintInvalidationRect, const LayoutRect& previousPaintInvalidationRect, bool needsPaintInvalidation, LayoutBox& box, const LayoutBoxModelObject& paintInvalidationContainer)
-{
-    bool shouldInvalidateNewRect = needsPaintInvalidation;
-    if (newPaintInvalidationRect != previousPaintInvalidationRect) {
+    if (paintInvalidationRect != previousPaintInvalidationRect) {
         box.invalidatePaintUsingContainer(paintInvalidationContainer, previousPaintInvalidationRect, PaintInvalidationScroll);
-        shouldInvalidateNewRect = true;
+        previousPaintInvalidationRect = paintInvalidationRect;
+        needsPaintInvalidation = true;
     }
-    if (shouldInvalidateNewRect) {
-        box.invalidatePaintUsingContainer(paintInvalidationContainer, newPaintInvalidationRect, PaintInvalidationScroll);
-        box.enclosingLayer()->setNeedsRepaint();
+
+    if (needsPaintInvalidation) {
+        box.invalidatePaintUsingContainer(paintInvalidationContainer, paintInvalidationRect, PaintInvalidationScroll);
         return true;
     }
+
     return false;
 }
 
-struct ScrollbarPaintInvalidationData {
-    Scrollbar* scrollbar;
-    GraphicsLayer* graphicsLayer;
-    LayoutRect& previousPaintInvalidatioRect;
-
-};
-
-static void invalidatePaintOfScrollbarIfNeeded(Scrollbar* scrollbar, GraphicsLayer* graphicsLayer, bool& previouslyWasOverlay, LayoutRect& previousPaintInvalidationRect, bool needsPaintInvalidationArg, LayoutBox& box, const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
+static void invalidatePaintOfScrollbarIfNeeded(Scrollbar* scrollbar, GraphicsLayer* scrollbarGraphicsLayer, LayoutRect& previousPaintInvalidationRect, bool needsPaintInvalidation, LayoutBox& box, const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
 {
-    bool isOverlay = scrollbar && scrollbar->isOverlayScrollbar();
-
-    // Calculate paint invalidation rect of the scrollbar, except overlay composited scrollbars because we invalidate the graphics layer only.
-    LayoutRect newPaintInvalidationRect;
-    if (scrollbar && !(graphicsLayer && isOverlay))
-        newPaintInvalidationRect = scrollControlPaintInvalidationRect(scrollbar->frameRect(), box, paintInvalidationState, paintInvalidationContainer);
-
-    bool needsPaintInvalidation = needsPaintInvalidationArg;
-    if (graphicsLayer && needsPaintInvalidation) {
-        graphicsLayer->setNeedsDisplay();
-        graphicsLayer->setContentsNeedsDisplay();
-        // If the scrollbar needs paint invalidation but didn't change location/size or the scrollbar is an
-        // overlay scrollbar (paint invalidation rect is empty), invalidating the graphics layer is enough.
-        // Otherwise invalidatePaintOfScrollControlIfNeeded() below will invalidate the old and new location
-        // of the scrollbar on the box's paint invalidation container to ensure newly expanded/shrunk areas
-        // of the box to be invalidated.
-        needsPaintInvalidation = false;
-    }
-
-    // Invalidate the box's display item client if the box's padding box size is affected by change of the
-    // non-overlay scrollbar width. We detect change of paint invalidation rect size instead of change of
-    // scrollbar width change, which may have some false-positives (e.g. the scrollbar changed length but
-    // not width) but won't invalidate more than expected because in the false-positive case the box must
-    // have changed size and have been invalidated.
-    LayoutSize newScrollbarUsedSpaceInBox;
-    if (!isOverlay)
-        newScrollbarUsedSpaceInBox = newPaintInvalidationRect.size();
-    LayoutSize previousScrollbarUsedSpaceInBox;
-    if (!previouslyWasOverlay)
-        previousScrollbarUsedSpaceInBox= previousPaintInvalidationRect.size();
-    if (newScrollbarUsedSpaceInBox != previousScrollbarUsedSpaceInBox)
-        paintInvalidationContainer.invalidateDisplayItemClientOnBacking(box, PaintInvalidationScroll, nullptr);
-
-    bool invalidated = invalidatePaintOfScrollControlIfNeeded(newPaintInvalidationRect, previousPaintInvalidationRect, needsPaintInvalidation, box, paintInvalidationContainer);
-
-    previousPaintInvalidationRect = newPaintInvalidationRect;
-    previouslyWasOverlay = isOverlay;
-
-    if (!invalidated || !scrollbar || graphicsLayer)
+    IntRect scrollbarRect = scrollbar && !scrollbarGraphicsLayer ? scrollbar->frameRect() : IntRect();
+    if (!invalidatePaintOfScrollControlIfNeeded(scrollbarRect, previousPaintInvalidationRect, needsPaintInvalidation, box, paintInvalidationState, paintInvalidationContainer))
+        return;
+    if (!scrollbar)
         return;
 
     paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*scrollbar, PaintInvalidationScroll, &previousPaintInvalidationRect);
+    box.enclosingLayer()->setNeedsRepaint();
     if (scrollbar->isCustomScrollbar())
         toLayoutScrollbar(scrollbar)->invalidateDisplayItemClientsOfScrollbarParts(paintInvalidationContainer, previousPaintInvalidationRect);
 }
@@ -107,12 +62,18 @@
 void PaintInvalidationCapableScrollableArea::invalidatePaintOfScrollControlsIfNeeded(const PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
 {
     LayoutBox& box = boxForScrollControlPaintInvalidation();
-    invalidatePaintOfScrollbarIfNeeded(horizontalScrollbar(), layerForHorizontalScrollbar(), m_horizontalScrollbarPreviouslyWasOverlay, m_horizontalScrollbarPreviousPaintInvalidationRect, horizontalScrollbarNeedsPaintInvalidation(), box, paintInvalidationState, paintInvalidationContainer);
-    invalidatePaintOfScrollbarIfNeeded(verticalScrollbar(), layerForVerticalScrollbar(), m_verticalScrollbarPreviouslyWasOverlay, m_verticalScrollbarPreviousPaintInvalidationRect, verticalScrollbarNeedsPaintInvalidation(), box, paintInvalidationState, paintInvalidationContainer);
+    LayoutRect oldRect = m_horizontalScrollbarPreviousPaintInvalidationRect;
+    invalidatePaintOfScrollbarIfNeeded(horizontalScrollbar(), layerForHorizontalScrollbar(), m_horizontalScrollbarPreviousPaintInvalidationRect, horizontalScrollbarNeedsPaintInvalidation(), box, paintInvalidationState, paintInvalidationContainer);
+    bool scrollbarGeometryChanged = oldRect != m_horizontalScrollbarPreviousPaintInvalidationRect;
 
-    LayoutRect scrollCornerPaintInvalidationRect = scrollControlPaintInvalidationRect(scrollCornerRect(), box, paintInvalidationState, paintInvalidationContainer);
-    if (invalidatePaintOfScrollControlIfNeeded(scrollCornerPaintInvalidationRect, m_scrollCornerPreviousPaintInvalidationRect, scrollCornerNeedsPaintInvalidation(), box, paintInvalidationContainer)) {
-        m_scrollCornerPreviousPaintInvalidationRect = scrollCornerPaintInvalidationRect;
+    oldRect = m_verticalScrollbarPreviousPaintInvalidationRect;
+    invalidatePaintOfScrollbarIfNeeded(verticalScrollbar(), layerForVerticalScrollbar(), m_verticalScrollbarPreviousPaintInvalidationRect, verticalScrollbarNeedsPaintInvalidation(), box, paintInvalidationState, paintInvalidationContainer);
+    scrollbarGeometryChanged |= oldRect != m_verticalScrollbarPreviousPaintInvalidationRect;
+
+    if (scrollbarGeometryChanged)
+        paintInvalidationContainer.invalidateDisplayItemClientOnBacking(box, PaintInvalidationScroll, nullptr);
+
+    if (invalidatePaintOfScrollControlIfNeeded(scrollCornerRect(), m_scrollCornerPreviousPaintInvalidationRect, scrollCornerNeedsPaintInvalidation(), box, paintInvalidationState, paintInvalidationContainer)) {
         if (LayoutScrollbarPart* scrollCorner = this->scrollCorner())
             scrollCorner->invalidateDisplayItemClientsIncludingNonCompositingDescendants(&paintInvalidationContainer, PaintInvalidationScroll, &m_scrollCornerPreviousPaintInvalidationRect);
         if (LayoutScrollbarPart* resizer = this->resizer())
@@ -122,11 +83,4 @@
     clearNeedsPaintInvalidationForScrollControls();
 }
 
-void PaintInvalidationCapableScrollableArea::clearPreviousPaintInvalidationRects()
-{
-    m_horizontalScrollbarPreviousPaintInvalidationRect = LayoutRect();
-    m_verticalScrollbarPreviousPaintInvalidationRect = LayoutRect();
-    m_scrollCornerPreviousPaintInvalidationRect = LayoutRect();
-}
-
 } // namespace blink