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 b18c2a16609a74d0189fa255d766f8f7e86d1a15..f474b93a45cf01ec08a84531734f1bad0981aa85 100644 |
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp |
@@ -232,9 +232,7 @@ void PaintController::copyCachedSubsequence(const DisplayItemList& currentList, |
// 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 DisplayItemClie
|
updatedList.appendByMoving(*currentIt, currentList.visualRect(currentIt - m_currentPaintArtifact.getDisplayItemList().begin()), gpuAnalyzer); |
++currentIt; |
} while (!endSubsequenceId.matches(updatedList.last())); |
@@ -313,10 +311,8 @@ void PaintController::commitNewDisplayItems(const LayoutSize& offsetFromLayoutOb |
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
|
-#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); |