Move PreviousBoxGeometries from BoxPaintInvalidator into LayoutBox::m_rareData

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1725 matching lines @@
       DCHECK_EQ(m_layoutObject.document().lifecycle().state(),
                 DocumentLifecycle::InPrePaint);
       m_layoutObject.m_paintOffset = p;
     }
     void setHasPreviousLocationInBacking(bool b) {
       m_layoutObject.m_bitfields.setHasPreviousLocationInBacking(b);
     }
     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);
     }
     void updatePreviousOutlineMayBeAffectedByDescendants() {
       m_layoutObject.setPreviousOutlineMayBeAffectedByDescendants(
           m_layoutObject.outlineMayBeAffectedByDescendants());
     }
 
     void clearPreviousVisualRects() {
       m_layoutObject.clearPreviousVisualRects();
@@ skipping 99 matching lines @@
   }
 
   // Paint invalidators will access the internal global map storing the data
   // only when the flag is set, to avoid unnecessary map lookups.
   bool hasPreviousLocationInBacking() const {
     return m_bitfields.hasPreviousLocationInBacking();
   }
   bool hasPreviousSelectionVisualRect() const {
     return m_bitfields.hasPreviousSelectionVisualRect();
   }
-  bool hasPreviousBoxGeometries() const {
-    return m_bitfields.hasPreviousBoxGeometries();
-  }
 
   bool backgroundChangedSinceLastPaintInvalidation() const {
     return m_bitfields.backgroundChangedSinceLastPaintInvalidation();
   }
   void setBackgroundChangedSinceLastPaintInvalidation() {
     m_bitfields.setBackgroundChangedSinceLastPaintInvalidation(true);
   }
 
   bool outlineMayBeAffectedByDescendants() const {
     return m_bitfields.outlineMayBeAffectedByDescendants();
@@ skipping 341 matching lines @@
           m_childrenInline(false),
           m_containsInlineWithOutlineAndContinuation(false),
           m_alwaysCreateLineBoxesForLayoutInline(false),
           m_previousBackgroundObscured(false),
           m_isBackgroundAttachmentFixedObject(false),
           m_isScrollAnchorObject(false),
           m_scrollAnchorDisablingStyleChanged(false),
           m_hasBoxDecorationBackground(false),
           m_hasPreviousLocationInBacking(false),
           m_hasPreviousSelectionVisualRect(false),
-          m_hasPreviousBoxGeometries(false),
           m_needsPaintPropertyUpdate(true),
           m_subtreeNeedsPaintPropertyUpdate(true),
           m_descendantNeedsPaintPropertyUpdate(true),
           m_backgroundChangedSinceLastPaintInvalidation(false),
           m_outlineMayBeAffectedByDescendants(false),
           m_previousOutlineMayBeAffectedByDescendants(false),
           m_positionedState(IsStaticallyPositioned),
           m_selectionState(SelectionNone),
           m_backgroundObscurationState(BackgroundObscurationStatusInvalid),
           m_fullPaintInvalidationReason(PaintInvalidationNone) {}
@@ skipping 152 matching lines @@
     ADD_BOOLEAN_BITFIELD(scrollAnchorDisablingStyleChanged,
                          ScrollAnchorDisablingStyleChanged);
 
     ADD_BOOLEAN_BITFIELD(hasBoxDecorationBackground,
                          HasBoxDecorationBackground);
 
     ADD_BOOLEAN_BITFIELD(hasPreviousLocationInBacking,
                          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().
     ADD_BOOLEAN_BITFIELD(needsPaintPropertyUpdate, NeedsPaintPropertyUpdate);
     // Whether paint properties of the whole subtree need to be updated.
     ADD_BOOLEAN_BITFIELD(subtreeNeedsPaintPropertyUpdate,
                          SubtreeNeedsPaintPropertyUpdate)
     // Whether the paint properties of a descendant need to be updated. For more
     // details, see LayoutObject::descendantNeedsPaintPropertyUpdate().
     ADD_BOOLEAN_BITFIELD(descendantNeedsPaintPropertyUpdate,
                          DescendantNeedsPaintPropertyUpdate);
 
     ADD_BOOLEAN_BITFIELD(backgroundChangedSinceLastPaintInvalidation,
                          BackgroundChangedSinceLastPaintInvalidation);
 
     // Whether shape of outline may be affected by any descendants. This is
     // updated before paint invalidation, checked during paint invalidation.
     ADD_BOOLEAN_BITFIELD(outlineMayBeAffectedByDescendants,
                          OutlineMayBeAffectedByDescendants);
     // The outlineMayBeAffectedByDescendants status of the last paint
     // invalidation.
     ADD_BOOLEAN_BITFIELD(previousOutlineMayBeAffectedByDescendants,
                          PreviousOutlineMayBeAffectedByDescendants);
 
    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
     // (see ComputedStyle::position).
     unsigned m_positionedState : 2;  // PositionedState
     unsigned m_selectionState : 3;   // SelectionState
     // Mutable for getter which lazily update this field.
     mutable unsigned
         m_backgroundObscurationState : 2;        // BackgroundObscurationState
     unsigned m_fullPaintInvalidationReason : 5;  // PaintInvalidationReason
@@ skipping 329 matching lines @@
 CORE_EXPORT void showLineTree(const blink::LayoutObject*);
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1,
                                 const blink::LayoutObject* object2);
 
 #endif
 
 #endif  // LayoutObject_h