Invalidate as DisplayItemClient when PaintLayer is setNeedsRepaint

third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
index ba87f0278c47ca356ad4304f16b0597ccc68760c..755f9709765f8e87302fe610b55738f7b971e511 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
@@ -201,7 +201,7 @@ void PaintController::copyCachedSubsequence(const DisplayItemList& currentList,
         DCHECK(currentIt != m_currentPaintArtifact.getDisplayItemList().end());
         DCHECK(currentIt->hasValidClient());
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
-        CHECK(currentIt->client().isAlive());
+        CHECK(clientCacheIsValid(currentIt->client()) || !currentIt->isCacheable());
 #endif
         updatedList.appendByMoving(*currentIt, currentList.visualRect(currentIt - m_currentPaintArtifact.getDisplayItemList().begin()), gpuAnalyzer);
         ++currentIt;
@@ -280,7 +280,9 @@ void PaintController::commitNewDisplayItems(const LayoutSize& offsetFromLayoutOb
 
         if (newDisplayItemHasCachedType) {
             DCHECK(newDisplayItem.isCached());
-            DCHECK(clientCacheIsValid(newDisplayItem.client()));
+#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
+            CHECK(clientCacheIsValid(newDisplayItem.client()));
+#endif
             if (!isSynchronized) {
                 currentIt = findOutOfOrderCachedItem(newDisplayItemId, outOfOrderIndexContext);