third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp - Issue 1497873002: Make DisplayItemClient an interface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Issue 1497873002: Make DisplayItemClient an interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years 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/layout/LayoutBoxModelObject.h ('k') | third_party/WebKit/Source/core/layout/LayoutObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

index 06b747857bf5c636f032f9636b2e59c468b49fec..ffda0614a362d75079a1fa773a0837dfe0155ebf 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

@@ -402,7 +402,7 @@ void LayoutBoxModelObject::setBackingNeedsPaintInvalidationInRect(const LayoutRe

}

-void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayItemClientWrapper& displayItemClient, PaintInvalidationReason invalidationReason, const LayoutRect* paintInvalidationRect) const

+void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayItemClient& displayItemClient, PaintInvalidationReason invalidationReason, const LayoutRect* paintInvalidationRect) const

{

if (layer()->groupedMapping()) {

if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashingLayer()) {

@@ -413,7 +413,7 @@ void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayIte

squashingLayer->invalidateDisplayItemClient(displayItemClient, invalidationReason, paintInvalidationRect ? &paintInvalidationRectOnSquashingLayer : nullptr);

}

} else if (CompositedLayerMapping* compositedLayerMapping = layer()->compositedLayerMapping()) {

- if (this->displayItemClient() != displayItemClient.displayItemClient() && isBox() && toLayoutBox(this)->usesCompositedScrolling()) {

+ if (this != &displayItemClient && isBox() && toLayoutBox(this)->usesCompositedScrolling()) {

// This paint invalidation container is using composited scrolling, and we are invalidating a scrolling content,

// so we should invalidate on the scrolling contents layer only.

compositedLayerMapping->invalidateDisplayItemClientOnScrollingContentsLayer(displayItemClient, invalidationReason, paintInvalidationRect);