Changes in DisplayItemClient for spv2 paint invalidation

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

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 915e7e4c6115a034120284471ad4ff2d47eec0ef..d2afbb74606fd5f181b60bb64503bfe2932e6a6d 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -116,17 +116,16 @@ LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
 }
 #endif
 
-struct SameSizeAsLayoutObject {
+struct SameSizeAsLayoutObject : DisplayItemClient {
     virtual ~SameSizeAsLayoutObject() { } // Allocate vtable pointer.
+    LayoutPoint position;
+    LayoutRect rect;
     void* pointers[6];
 #if ENABLE(ASSERT)
     unsigned m_debugBitfields : 2;
 #endif
     unsigned m_bitfields;
     unsigned m_bitfields2;
-    LayoutRect rect; // Stores the previous paint invalidation rect.
-    LayoutPoint position; // Stores the previous position from the paint invalidation container.
-    DisplayItemCacheGeneration cacheGeneration;

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

Won't m_cacheGenerationOrInvalidationReason still be there by virtue of
inheriting from DisplayItemClient?

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

Yes, it's still there.

 };
 
 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObject should stay small");
@@ -1199,7 +1198,7 @@ void LayoutObject::invalidateDisplayItemClient(const DisplayItemClient& client,
     // various ways (e.g. PaintInvalidatinState::enclosingSelfPaintingLayer()) to reduce the cost.
     DCHECK(!paintingLayer() || paintingLayer()->needsRepaint());
 
-    client.setDisplayItemsUncached();
+    client.setDisplayItemsUncached(reason);
 
     if (FrameView* frameView = this->frameView())
         frameView->trackObjectPaintInvalidation(client, reason);