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

Unified Diff: Source/core/rendering/RenderLayer.cpp

Issue 236203020: Separate repaint and layout requirements of StyleDifference (Step 1) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase, Fix break Created 6 years, 8 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 | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderLayerModelObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index eb7c85857fcc3b4228e53e7c748528a5fabe29df..39655d813c76fcc8757edb056d1195e746e9c8e5 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -3797,7 +3797,7 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
m_scrollableArea->updateAfterStyleChange(oldStyle);
if (!oldStyle || oldStyle->visibility() != renderer()->style()->visibility()) {
- ASSERT(!oldStyle || diff >= StyleDifferenceRepaint);
+ ASSERT(!oldStyle || diff.needsRepaint() || diff.needsLayout());
compositor()->setNeedsUpdateCompositingRequirementsState();
}
@@ -3806,12 +3806,12 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
updateSelfPaintingLayer();
if (!oldStyle || renderer()->style()->position() != oldStyle->position()) {
- ASSERT(!oldStyle || diff >= StyleDifferenceLayout);
+ ASSERT(!oldStyle || diff.needsFullLayout());
updateOutOfFlowPositioned(oldStyle);
}
if (!oldStyle || !renderer()->style()->reflectionDataEquivalent(oldStyle)) {
- ASSERT(!oldStyle || diff >= StyleDifferenceLayout);
+ ASSERT(!oldStyle || diff.needsFullLayout());
updateReflectionInfo(oldStyle);
}
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderLayerModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698