Revert of Divorce PaintInvalidationState from LayoutState

Source/core/rendering/RenderListItem.cpp

Index: Source/core/rendering/RenderListItem.cpp
diff --git a/Source/core/rendering/RenderListItem.cpp b/Source/core/rendering/RenderListItem.cpp
index ee8e87f85876912665e63e5bb95c15617a5d06f0..1ce4b3009216e589ae8a2b7d8f13237e61c2bddf 100644
--- a/Source/core/rendering/RenderListItem.cpp
+++ b/Source/core/rendering/RenderListItem.cpp
@@ -274,6 +274,9 @@ void RenderListItem::updateMarkerLocationAndInvalidateWidth()
     // FIXME: We should not modify the structure of the render tree
     // during layout. crbug.com/370461
     DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
+    // Removing and adding the marker can trigger repainting in
+    // containers other than ourselves, so we need to disable LayoutState.
+    ForceHorriblySlowRectMapping slowRectMapping(*this);
     if (updateMarkerLocation()) {
         // If the marker is inside we need to redo the preferred width calculations
         // as the size of the item now includes the size of the list marker.