Move PreviousBoxGeometries from BoxPaintInvalidator into LayoutBox::m_rareData

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

Index: third_party/WebKit/Source/core/layout/LayoutObject.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
index 4cc4a994224a99b69acfb66707c1e3f220f46301..05ad6cf5943beabd49765c87a7c5436a936f3245 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.h
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
@@ -1743,9 +1743,6 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
     void setHasPreviousSelectionVisualRect(bool b) {
       m_layoutObject.m_bitfields.setHasPreviousSelectionVisualRect(b);
     }
-    void setHasPreviousBoxGeometries(bool b) {
-      m_layoutObject.m_bitfields.setHasPreviousBoxGeometries(b);
-    }
     void setPreviousBackgroundObscured(bool b) {
       m_layoutObject.setPreviousBackgroundObscured(b);
     }
@@ -1865,9 +1862,6 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   bool hasPreviousSelectionVisualRect() const {
     return m_bitfields.hasPreviousSelectionVisualRect();
   }
-  bool hasPreviousBoxGeometries() const {
-    return m_bitfields.hasPreviousBoxGeometries();
-  }
 
   bool backgroundChangedSinceLastPaintInvalidation() const {
     return m_bitfields.backgroundChangedSinceLastPaintInvalidation();
@@ -2229,7 +2223,6 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
           m_hasBoxDecorationBackground(false),
           m_hasPreviousLocationInBacking(false),
           m_hasPreviousSelectionVisualRect(false),
-          m_hasPreviousBoxGeometries(false),
           m_needsPaintPropertyUpdate(true),
           m_subtreeNeedsPaintPropertyUpdate(true),
           m_descendantNeedsPaintPropertyUpdate(true),
@@ -2402,7 +2395,6 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
                          HasPreviousLocationInBacking);
     ADD_BOOLEAN_BITFIELD(hasPreviousSelectionVisualRect,
                          HasPreviousSelectionVisualRect);
-    ADD_BOOLEAN_BITFIELD(hasPreviousBoxGeometries, HasPreviousBoxGeometries);
 
     // Whether the paint properties need to be updated. For more details, see
     // LayoutObject::needsPaintPropertyUpdate().
@@ -2429,7 +2421,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
 
    protected:
     // Use protected to avoid warning about unused variable.
-    unsigned m_unusedBits : 4;
+    unsigned m_unusedBits : 5;
 
    private:
     // This is the cached 'position' value of this object