Revert of Calculate paint invalidation rect for scrollbars

third_party/WebKit/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 1411 matching lines @@
 bool LayoutBox::intersectsVisibleViewport()
 {
     LayoutRect rect = visualOverflowRect();
     LayoutView* layoutView = view();
     while (layoutView->frame()->ownerLayoutObject())
         layoutView = layoutView->frame()->ownerLayoutObject()->view();
     mapRectToPaintInvalidationBacking(layoutView, rect, 0);
     return rect.intersects(LayoutRect(layoutView->frameView()->scrollableArea()->visibleContentRectDouble()));
 }
 
-PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
+PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& newPaintInvalidationContainer)
 {
     PaintInvalidationReason fullInvalidationReason = fullPaintInvalidationReason();
     // If the current paint invalidation reason is PaintInvalidationDelayedFull, then this paint invalidation can delayed if the
     // LayoutBox in question is not on-screen. The logic to decide whether this is appropriate exists at the site of the original
     // paint invalidation that chose PaintInvalidationDelayedFull.
     if (fullInvalidationReason == PaintInvalidationDelayedFull) {
         if (!intersectsVisibleViewport())
             return PaintInvalidationDelayedFull;
 
         // Reset state back to regular full paint invalidation if the object is onscreen.
         setShouldDoFullPaintInvalidation(PaintInvalidationFull);
     }
 
-    PaintInvalidationReason reason = LayoutBoxModelObject::invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationContainer);
+    PaintInvalidationReason reason = LayoutBoxModelObject::invalidatePaintIfNeeded(paintInvalidationState, newPaintInvalidationContainer);
 
-    if (!view()->doingFullPaintInvalidation() && !isFullPaintInvalidationReason(reason))
+    bool willDoFullInvalidation = view()->doingFullPaintInvalidation() || isFullPaintInvalidationReason(reason);
+    if (!willDoFullInvalidation)
         invalidatePaintForOverflowIfNeeded();
 
-    if (PaintLayerScrollableArea* area = scrollableArea())
-        area->invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState, paintInvalidationContainer);
+    // Issue paint invalidations for any scrollbars if there is a scrollable area for this layoutObject.
+    if (ScrollableArea* area = scrollableArea()) {
+        if (area->hasVerticalBarDamage()) {
+            if (!willDoFullInvalidation)
+                invalidatePaintRectangleNotInvalidatingDisplayItemClients(LayoutRect(area->verticalBarDamage()));
+            // TODO(wangxianzhu): Pass current bounds of the scrollbar to PaintController. crbug.com/547119.
+            if (Scrollbar* verticalScrollbar = area->verticalScrollbar())
+                invalidateDisplayItemClient(*verticalScrollbar);
+        }
+        if (area->hasHorizontalBarDamage()) {
+            if (!willDoFullInvalidation)
+                invalidatePaintRectangleNotInvalidatingDisplayItemClients(LayoutRect(area->horizontalBarDamage()));
+            // TODO(wangxianzhu): Pass current bounds of the scrollbar to PaintController. crbug.com/547119.
+            if (Scrollbar* horizontalScrollbar = area->horizontalScrollbar())
+                invalidateDisplayItemClient(*horizontalScrollbar);
+        }
+    }
 
     // This is for the next invalidatePaintIfNeeded so must be at the end.
     savePreviousBoxSizesIfNeeded();
     return reason;
 }
 
+void LayoutBox::clearPaintInvalidationState(const PaintInvalidationState& paintInvalidationState)
+{
+    LayoutBoxModelObject::clearPaintInvalidationState(paintInvalidationState);
+
+    if (ScrollableArea* area = scrollableArea())
+        area->resetScrollbarDamage();
+}
+
+#if ENABLE(ASSERT)
+bool LayoutBox::paintInvalidationStateIsDirty() const
+{
+    if (ScrollableArea* area = scrollableArea()) {
+        if (area->hasVerticalBarDamage() || area->hasHorizontalBarDamage())
+            return true;
+    }
+    return LayoutBoxModelObject::paintInvalidationStateIsDirty();
+}
+#endif
+
 LayoutRect LayoutBox::overflowClipRect(const LayoutPoint& location, OverlayScrollbarSizeRelevancy relevancy) const
 {
     // FIXME: When overflow-clip (CSS3) is implemented, we'll obtain the property
     // here.
     LayoutRect clipRect = borderBoxRect();
     clipRect.setLocation(location + clipRect.location() + LayoutSize(borderLeft(), borderTop()));
     clipRect.setSize(clipRect.size() - LayoutSize(borderLeft() + borderRight(), borderTop() + borderBottom()));
 
     if (hasOverflowClip())
         excludeScrollbars(clipRect, relevancy);
@@ skipping 3363 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