Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

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

Issue 2792863002: Revert of Skip paint property update and visual rect update if no geometry change (Closed)
Patch Set: Created 3 years, 9 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
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 b56c6845d6c8d3fca7b1243e90779ad9abeb86fb..3d9ec1d68025a2fb48b1b0e85c04b0e980f71e88 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidationCapableScrollableArea.cpp
@@ -11,7 +11,6 @@
#include "core/layout/LayoutScrollbar.h"
#include "core/layout/LayoutScrollbarPart.h"
#include "core/layout/PaintInvalidationState.h"
-#include "core/paint/FindPaintOffsetAndVisualRectNeedingUpdate.h"
#include "core/paint/ObjectPaintInvalidator.h"
#include "core/paint/PaintInvalidator.h"
#include "core/paint/PaintLayer.h"
@@ -35,16 +34,8 @@
static LayoutRect scrollControlVisualRect(
const IntRect& scrollControlRect,
const LayoutBox& box,
- const PaintInvalidatorContext& context,
- const LayoutRect& previousVisualRect) {
+ const PaintInvalidatorContext& context) {
LayoutRect visualRect(scrollControlRect);
-#if DCHECK_IS_ON()
- FindVisualRectNeedingUpdateScope finder(box, context, previousVisualRect,
- visualRect);
-#endif
- if (!context.needsVisualRectUpdate(box))
- return previousVisualRect;
-
// No need to apply any paint offset. Scroll controls paint in a different
// transform space than their contained box (the scrollbarPaintOffset
// transform node).
@@ -91,12 +82,12 @@
const PaintInvalidatorContext& context) {
bool isOverlay = scrollbar && scrollbar->isOverlayScrollbar();
- LayoutRect newVisualRect;
// Calculate visual rect of the scrollbar, except overlay composited
// scrollbars because we invalidate the graphics layer only.
+ LayoutRect newVisualRect;
if (scrollbar && !(graphicsLayer && isOverlay)) {
- newVisualRect = scrollControlVisualRect(scrollbar->frameRect(), box,
- context, previousVisualRect);
+ newVisualRect =
+ scrollControlVisualRect(scrollbar->frameRect(), box, context);
}
bool needsPaintInvalidation = needsPaintInvalidationArg;
@@ -169,8 +160,7 @@
verticalScrollbarNeedsPaintInvalidation(), box, context));
LayoutRect scrollCornerAndResizerVisualRect =
- scrollControlVisualRect(scrollCornerAndResizerRect(), box, context,
- m_scrollCornerAndResizerVisualRect);
+ scrollControlVisualRect(scrollCornerAndResizerRect(), box, context);
const LayoutBoxModelObject& paintInvalidationContainer =
*context.paintInvalidationContainer;
if (invalidatePaintOfScrollControlIfNeeded(

Powered by Google App Engine
This is Rietveld 408576698