Revert of Separate repaint and layout requirements of StyleDifference (Step 1)

Source/core/rendering/RenderLayer.cpp

Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index 39655d813c76fcc8757edb056d1195e746e9c8e5..eb7c85857fcc3b4228e53e7c748528a5fabe29df 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.needsRepaint() || diff.needsLayout());
+        ASSERT(!oldStyle || diff >= StyleDifferenceRepaint);
         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.needsFullLayout());
+        ASSERT(!oldStyle || diff >= StyleDifferenceLayout);
         updateOutOfFlowPositioned(oldStyle);
     }
 
     if (!oldStyle || !renderer()->style()->reflectionDataEquivalent(oldStyle)) {
-        ASSERT(!oldStyle || diff.needsFullLayout());
+        ASSERT(!oldStyle || diff >= StyleDifferenceLayout);
         updateReflectionInfo(oldStyle);
     }