Move previous border box size out of global map into LayoutBox::m_previousSize

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 300 matching lines @@
       setHeight(size);
     else
       setWidth(size);
   }
 
   LayoutPoint location() const { return m_frameRect.location(); }
   LayoutSize locationOffset() const {
     return LayoutSize(m_frameRect.x(), m_frameRect.y());
   }
   LayoutSize size() const { return m_frameRect.size(); }
+  LayoutSize previousSize() const { return m_previousSize; }
   IntSize pixelSnappedSize() const { return m_frameRect.pixelSnappedSize(); }
 
   void setLocation(const LayoutPoint& location) {
     if (location == m_frameRect.location())
       return;
     m_frameRect.setLocation(location);
     locationChanged();
   }
 
   // The ancestor box that this object's location and physicalLocation are
@@ skipping 970 matching lines @@
 
   // Returns true if the box intersects the viewport visible to the user.
   bool intersectsVisibleViewport() const;
 
   bool hasNonCompositedScrollbars() const final;
 
   void ensureIsReadyForPaintInvalidation() override;
 
   virtual bool hasControlClip() const { return false; }
 
+  class MutableForPainting : public LayoutObject::MutableForPainting {
+   public:
+    void setPreviousSize(const LayoutSize& size) {
+      static_cast<LayoutBox&>(m_layoutObject).m_previousSize = size;
+    }
+
+   protected:
+    friend class LayoutBox;
+    MutableForPainting(const LayoutBox& box)
+        : LayoutObject::MutableForPainting(box) {}
+  };
+  MutableForPainting getMutableForPainting() const {
+    return MutableForPainting(*this);
+  }
+
  protected:
   virtual LayoutRect controlClipRect(const LayoutPoint&) const {
     return LayoutRect();
   }
 
   void willBeDestroyed() override;
 
   void insertedIntoTree() override;
   void willBeRemovedFromTree() override;
 
@@ skipping 179 matching lines @@
 
   void locationChanged();
   void sizeChanged();
 
   virtual bool isInSelfHitTestingPhase(HitTestAction hitTestAction) const {
     return hitTestAction == HitTestForeground;
   }
 
   void updateBackgroundAttachmentFixedStatusAfterStyleChange();
 
+  void inflateVisualRectForFilter(LayoutRect&) const;
+  void inflateVisualRectForFilterUnderContainer(
+      LayoutRect&,
+      const LayoutObject& container,
+      const LayoutBoxModelObject* ancestorToStopAt) const;
+
+  LayoutRectOutsets m_marginBoxOutsets;
+
+  void addSnapArea(const LayoutBox&);
+  void removeSnapArea(const LayoutBox&);
+
+  LayoutRect debugRect() const override;
+
   // The CSS border box rect for this box.
   //
   // The rectangle is in this box's physical coordinates but with a
   // flipped block-flow direction (see the COORDINATE SYSTEMS section
   // in LayoutBoxModelObject). The location is the distance from this
   // object's border edge to the container's border edge (which is not
   // always the parent). Thus it includes any logical top/left along
   // with this box's margins.
   LayoutRect m_frameRect;
 
+  // Previous size of m_frameRect, updated after paint invalidation.
+  LayoutSize m_previousSize;
+
   // Our intrinsic height, used for min-height: min-content etc. Maintained by
   // updateLogicalHeight. This is logicalHeight() before it is clamped to
   // min/max.
   mutable LayoutUnit m_intrinsicContentLogicalHeight;
 
-  void inflateVisualRectForFilter(LayoutRect&) const;
-  void inflateVisualRectForFilterUnderContainer(
-      LayoutRect&,
-      const LayoutObject& container,
-      const LayoutBoxModelObject* ancestorToStopAt) const;
-
-  LayoutRectOutsets m_marginBoxOutsets;
-
-  void addSnapArea(const LayoutBox&);
-  void removeSnapArea(const LayoutBox&);
-
-  LayoutRect debugRect() const override;
-
  protected:
   // The logical width of the element if it were to break its lines at every
   // possible opportunity.
   //
   // See LayoutObject::minPreferredLogicalWidth() for more details.
   LayoutUnit m_minPreferredLogicalWidth;
 
   // The logical width of the element if it never breaks any lines at all.
   //
   // See LayoutObject::maxPreferredLogicalWidth() for more details.
@@ skipping 86 matching lines @@
          breakValue == EBreakBetween::kLeft ||
          breakValue == EBreakBetween::kPage ||
          breakValue == EBreakBetween::kRecto ||
          breakValue == EBreakBetween::kRight ||
          breakValue == EBreakBetween::kVerso;
 }
 
 }  // namespace blink
 
 #endif  // LayoutBox_h