Revert of Revert of Divorce PaintInvalidationState from LayoutState

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index a3b6284ff43d9997270be21af4fc50b51d10a545..2d48e70cbdaa29b4a6065a7ee192e398751c19f4 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -1017,9 +1017,9 @@
 
     TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInvalidation->debugName().ascii());
 
-    LayoutState rootLayoutState(*rootForPaintInvalidation);
-
-    rootForPaintInvalidation->invalidateTreeAfterLayout(*rootForPaintInvalidation->containerForPaintInvalidation());
+    PaintInvalidationState rootPaintInvalidationState(*rootForPaintInvalidation);
+
+    rootForPaintInvalidation->invalidateTreeAfterLayout(rootPaintInvalidationState);
 
     // Invalidate the paint of the frameviews scrollbars if needed
     if (hasVerticalBarDamage())