Move PreviousBoxGeometries from BoxPaintInvalidator into LayoutBox::m_rareData

third_party/WebKit/Source/core/layout/LayoutBox.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 0f73e71f2bfdf2ea81033d14418d0ec145e8998f..6babe4c1a59404622d54997ff1e77d00faffba86 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -134,8 +134,6 @@ void LayoutBox::willBeDestroyed() {
 
   ShapeOutsideInfo::removeInfo(*this);
 
-  BoxPaintInvalidator::boxWillBeDestroyed(*this);
-
   LayoutBoxModelObject::willBeDestroyed();
 }
 
@@ -5721,4 +5719,11 @@ bool LayoutBox::shouldClipOverflow() const {
   return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
 }
 
+void LayoutBox::MutableForPainting::savePreviousOtherBoxGeometries() {
+  auto& rareData = layoutBox().ensureRareData();
+  rareData.m_hasPreviousOtherBoxGeometries = true;
+  rareData.m_previousContentBoxSize = layoutBox().contentBoxRect().size();
+  rareData.m_previousLayoutOverflowRect = layoutBox().layoutOverflowRect();
+}
+
 }  // namespace blink