Changes in DisplayItemClient for spv2 paint invalidation

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

Index: third_party/WebKit/Source/core/layout/line/InlineBox.h
diff --git a/third_party/WebKit/Source/core/layout/line/InlineBox.h b/third_party/WebKit/Source/core/layout/line/InlineBox.h
index 3ffc5cfeb3bf147d0b273278b5d49f19815acb92..67e11df1de72ae8f53cc9aacb9bbc7b1a0891837 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineBox.h
+++ b/third_party/WebKit/Source/core/layout/line/InlineBox.h
@@ -56,13 +56,13 @@ public:
 
     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
@@ -395,6 +395,8 @@ private:
     // 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.
 
@@ -425,10 +427,6 @@ protected:
     LayoutUnit m_logicalWidth;
 
 private:
-    InlineBoxBitfields m_bitfields;
-
-    DISPLAY_ITEM_CACHE_STATUS_IMPLEMENTATION
-
 #if ENABLE(ASSERT)
     bool m_hasBadParent;
 #endif