Move PreviousBoxGeometries from BoxPaintInvalidator into LayoutBox::m_rareData

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 116 matching lines @@
   clearExtraInlineAndBlockOffests();
 
   if (isOutOfFlowPositioned())
     LayoutBlock::removePositionedObject(this);
   removeFromPercentHeightContainer();
   if (isOrthogonalWritingModeRoot() && !documentBeingDestroyed())
     unmarkOrthogonalWritingModeRoot();
 
   ShapeOutsideInfo::removeInfo(*this);
 
-  BoxPaintInvalidator::boxWillBeDestroyed(*this);
-
   LayoutBoxModelObject::willBeDestroyed();
 }
 
 void LayoutBox::insertedIntoTree() {
   LayoutBoxModelObject::insertedIntoTree();
   addScrollSnapMapping();
 
   if (isOrthogonalWritingModeRoot())
     markOrthogonalWritingModeRoot();
 }
@@ skipping 5565 matching lines @@
   if (block)
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 bool LayoutBox::shouldClipOverflow() const {
   return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
 }
 
+void LayoutBox::savePreviousOtherBoxGeometries() {
+  auto& rareData = ensureRareData();
+  rareData.m_hasPreviousOtherBoxGeometries = true;
+  rareData.m_previousContentBoxSize = contentBoxRect().size();
+  rareData.m_previousLayoutOverflowRect = layoutOverflowRect();
+}
+
 }  // namespace blink