Invalidate as DisplayItemClient when PaintLayer is setNeedsRepaint

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/paint/PaintController.h"
 
 #include "platform/TraceEvent.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
@@ skipping 214 matching lines @@
 }
 
 void PaintController::copyCachedSubsequence(const DisplayItemList& currentList, DisplayItemList::iterator& currentIt, DisplayItemList& updatedList, SkPictureGpuAnalyzer& gpuAnalyzer)
 {
     DCHECK(currentIt->getType() == DisplayItem::Subsequence);
     DisplayItem::Id endSubsequenceId(currentIt->client(), DisplayItem::EndSubsequence);
     do {
         // We should always find the EndSubsequence display item.
         DCHECK(currentIt != m_currentPaintArtifact.getDisplayItemList().end());
         DCHECK(currentIt->hasValidClient());
-#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
-        CHECK(currentIt->client().isAlive());
-#endif
+        CHECK(clientCacheIsValid(currentIt->client()) || !currentIt->isCacheable());

[chrishtr, 2016/06/18 22:13:54]

DCHECK instead?

[Xianzhu, 2016/06/18 23:51:25]

Used CHECK because I want this for DisplayItemClient aliveness checking.

Added #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS.

         updatedList.appendByMoving(*currentIt, currentList.visualRect(currentIt - m_currentPaintArtifact.getDisplayItemList().begin()), gpuAnalyzer);
         ++currentIt;
     } while (!endSubsequenceId.matches(updatedList.last()));
 }
 
 static IntRect visualRectForDisplayItem(const DisplayItem& displayItem, const LayoutSize& offsetFromLayoutObject)
 {
     LayoutRect visualRect = displayItem.client().visualRect();
     visualRect.move(-offsetFromLayoutObject);
     return enclosingIntRect(visualRect);
@@ skipping 58 matching lines @@
     DisplayItemList::iterator currentIt = m_currentPaintArtifact.getDisplayItemList().begin();
     DisplayItemList::iterator currentEnd = m_currentPaintArtifact.getDisplayItemList().end();
     for (DisplayItemList::iterator newIt = m_newDisplayItemList.begin(); newIt != m_newDisplayItemList.end(); ++newIt) {
         const DisplayItem& newDisplayItem = *newIt;
         const DisplayItem::Id newDisplayItemId = newDisplayItem.nonCachedId();
         bool newDisplayItemHasCachedType = newDisplayItem.getType() != newDisplayItemId.type;
 
         bool isSynchronized = currentIt != currentEnd && newDisplayItemId.matches(*currentIt);
 
         if (newDisplayItemHasCachedType) {
-#if DCHECK_IS_ON()
             DCHECK(newDisplayItem.isCached());
-            DCHECK(clientCacheIsValid(newDisplayItem.client()) || (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() && !paintOffsetWasInvalidated(newDisplayItem.client())));

[chrishtr, 2016/06/18 22:13:54]

Why is this now irrelevant?

[Xianzhu, 2016/06/18 23:51:25]

The removed code is for paint offset caching code which will be reimplemented
with PaintInvalidator.

Rebased on https://codereview.chromium.org/2051333005/ and this change is no
longer in this CL.

-#endif
+            CHECK(clientCacheIsValid(newDisplayItem.client()));

[chrishtr, 2016/06/18 22:13:54]

DCHECK?

[Xianzhu, 2016/06/18 23:51:25]

Ditto.

             if (!isSynchronized) {
                 currentIt = findOutOfOrderCachedItem(newDisplayItemId, outOfOrderIndexContext);
 
                 if (currentIt == currentEnd) {
 #ifndef NDEBUG
                     showDebugData();
                     WTFLogAlways("%s not found in m_currentDisplayItemList\n", newDisplayItem.asDebugString().utf8().data());
 #endif
                     NOTREACHED();
                     // We did not find the cached display item. This should be impossible, but may occur if there is a bug
@@ skipping 201 matching lines @@
 
 void PaintController::showDebugData() const
 {
     WTFLogAlways("current display item list: [%s]\n", displayItemListAsDebugString(m_currentPaintArtifact.getDisplayItemList()).utf8().data());
     WTFLogAlways("new display item list: [%s]\n", displayItemListAsDebugString(m_newDisplayItemList).utf8().data());
 }
 
 #endif // ifndef NDEBUG
 
 } // namespace blink