Source/core/rendering/RenderLayerModelObject.cpp - Issue 715623004: Merge 185075 "Revert paint-invalidation-container ASSERT"

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: Source/core/rendering/RenderLayerModelObject.cpp

Issue 715623004: Merge 185075 "Revert paint-invalidation-container ASSERT" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2171/

Patch Set: Created 6 years, 1 month 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: Source/core/rendering/RenderLayerModelObject.cpp

===================================================================

--- Source/core/rendering/RenderLayerModelObject.cpp (revision 185082)

+++ Source/core/rendering/RenderLayerModelObject.cpp (working copy)

@@ -181,7 +181,8 @@

bool establishesNewPaintInvalidationContainer = isPaintInvalidationContainer();

const RenderLayerModelObject& newPaintInvalidationContainer = *adjustCompositedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? this : &paintInvalidationState.paintInvalidationContainer());

- ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation());

+ // FIXME: This assert should be re-enabled when we move paint invalidation to after compositing update. crbug.com/360286

+ // ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation());

InvalidationReason reason = invalidatePaintIfNeeded(paintInvalidationState, newPaintInvalidationContainer);

clearPaintInvalidationState(paintInvalidationState);

« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | no next file » | no next file with comments »