Changes in DisplayItemClient for spv2 paint invalidation

third_party/WebKit/Source/core/layout/line/InlineBox.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 38 matching lines @@
         , m_lineLayoutItem(obj)
         , m_logicalWidth()
 #if ENABLE(ASSERT)
         , m_hasBadParent(false)
 #endif
     {
     }
 
     InlineBox(LineLayoutItem item, LayoutPoint topLeft, LayoutUnit logicalWidth, bool firstLine, bool constructed,
         bool dirty, bool extracted, bool isHorizontal, InlineBox* next, InlineBox* prev, InlineFlowBox* parent)
-        : m_next(next)
+        : m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal)

[chrishtr, 2016/06/27 21:09:09]

Why did this get moved?

[Xianzhu, 2016/06/27 21:34:54]

This is to avoid the gap between DisplayItemClient's cache generation field and
InlineBox's fields on 64-bit systems.

+        , m_next(next)
         , m_prev(prev)
         , m_parent(parent)
         , m_lineLayoutItem(item)
         , m_topLeft(topLeft)
         , m_logicalWidth(logicalWidth)
-        , m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal)
 #if ENABLE(ASSERT)
         , m_hasBadParent(false)
 #endif
     {
     }
 
     virtual ~InlineBox();
 
     virtual void destroy();
 
@@ skipping 312 matching lines @@
         signed expansion() const { return m_expansion; }
         void setExpansion(signed expansion) { m_expansion = expansion; }
     };
 #undef ADD_BOOLEAN_BITFIELD
 
 private:
     // Converts the given (top-left) position from the logical space of the InlineBox to the physical space of the
     // containing block. The size indicates the size of the box whose point is being flipped.
     LayoutPoint logicalPositionToPhysicalPoint(const LayoutPoint&, const LayoutSize&) const;
 
+    InlineBoxBitfields m_bitfields;
+
     InlineBox* m_next; // The next element on the same line as us.
     InlineBox* m_prev; // The previous element on the same line as us.
 
     InlineFlowBox* m_parent; // The box that contains us.
     LineLayoutItem m_lineLayoutItem;
 
 protected:
     // For RootInlineBox
     bool endsWithBreak() const { return m_bitfields.endsWithBreak(); }
     void setEndsWithBreak(bool endsWithBreak) { m_bitfields.setEndsWithBreak(endsWithBreak); }
@@ skipping 10 matching lines @@
     signed expansion() { return m_bitfields.expansion(); }
     void setExpansion(signed expansion) { m_bitfields.setExpansion(expansion); }
 
     // For InlineFlowBox and InlineTextBox
     bool extracted() const { return m_bitfields.extracted(); }
 
     LayoutPoint m_topLeft;
     LayoutUnit m_logicalWidth;
 
 private:
-    InlineBoxBitfields m_bitfields;
-
-    DISPLAY_ITEM_CACHE_STATUS_IMPLEMENTATION
-
 #if ENABLE(ASSERT)
     bool m_hasBadParent;
 #endif
 };
 
 #if !ENABLE(ASSERT)
 inline InlineBox::~InlineBox()
 {
 }
 #endif
@@ skipping 13 matching lines @@
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::InlineBox*);
 void showLineTree(const blink::InlineBox*);
 #endif
 
 #endif // InlineBox_h