third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp - Issue 2080593002: Revert of Let FrameView track object paint invalidations

Unified Diff: third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp

Issue 2080593002: Revert of Let FrameView track object paint invalidations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@TrackInvalidation

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/paint/LineBoxListPainter.cpp ('k') | third_party/WebKit/Source/platform/graphics/GraphicsLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f89da6ef3798c97d52fb050665f62dc192784b01..54e0de1f766790e7db65fac559fea344cce24e7d 100644

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

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

@@ -19,7 +19,7 @@

{

if (!scrollbar.isCustomScrollbar()

&& !(orientation == HorizontalScrollbar ? layerForHorizontalScrollbar() : layerForVerticalScrollbar()))

- boxForScrollControlPaintInvalidation().slowSetPaintingLayerNeedsRepaintAndInvalidateDisplayItemClient(scrollbar, PaintInvalidationScroll);

+ boxForScrollControlPaintInvalidation().invalidateDisplayItemClient(scrollbar);

ScrollableArea::willRemoveScrollbar(scrollbar, orientation);

}

@@ -82,7 +82,7 @@

if (!previouslyWasOverlay)

previousScrollbarUsedSpaceInBox= previousPaintInvalidationRect.size();

if (newScrollbarUsedSpaceInBox != previousScrollbarUsedSpaceInBox)

- box.setPaintingLayerNeedsRepaintAndInvalidateDisplayItemClient(paintInvalidationState, box, PaintInvalidationScroll);

+ paintInvalidationContainer.invalidateDisplayItemClientOnBacking(box, PaintInvalidationScroll, &box);

bool invalidated = invalidatePaintOfScrollControlIfNeeded(newPaintInvalidationRect, previousPaintInvalidationRect, needsPaintInvalidation, box, paintInvalidationContainer);

@@ -92,9 +92,9 @@

if (!invalidated || !scrollbar || graphicsLayer)

return;

- box.setPaintingLayerNeedsRepaintAndInvalidateDisplayItemClient(paintInvalidationState, *scrollbar, PaintInvalidationScroll);

+ paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*scrollbar, PaintInvalidationScroll);

if (scrollbar->isCustomScrollbar())

- toLayoutScrollbar(scrollbar)->invalidateDisplayItemClientsOfScrollbarParts();

+ toLayoutScrollbar(scrollbar)->invalidateDisplayItemClientsOfScrollbarParts(paintInvalidationContainer);

}

void PaintInvalidationCapableScrollableArea::invalidatePaintOfScrollControlsIfNeeded(const PaintInvalidationState& paintInvalidationState)

@@ -108,9 +108,9 @@

if (invalidatePaintOfScrollControlIfNeeded(scrollCornerPaintInvalidationRect, m_scrollCornerAndResizerPreviousPaintInvalidationRect, scrollCornerNeedsPaintInvalidation(), box, paintInvalidationContainer)) {

m_scrollCornerAndResizerPreviousPaintInvalidationRect = scrollCornerPaintInvalidationRect;

if (LayoutScrollbarPart* scrollCorner = this->scrollCorner())

- scrollCorner->invalidateDisplayItemClientsIncludingNonCompositingDescendants(PaintInvalidationScroll);

+ scrollCorner->invalidateDisplayItemClientsIncludingNonCompositingDescendants(&paintInvalidationContainer, PaintInvalidationScroll);

if (LayoutScrollbarPart* resizer = this->resizer())

- resizer->invalidateDisplayItemClientsIncludingNonCompositingDescendants(PaintInvalidationScroll);

+ resizer->invalidateDisplayItemClientsIncludingNonCompositingDescendants(&paintInvalidationContainer, PaintInvalidationScroll);

}

clearNeedsPaintInvalidationForScrollControls();