Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(987)

Unified Diff: Source/platform/graphics/paint/DisplayItemList.cpp

Issue 1195513004: Change DontCheck under-invalidation checking mode to CacheSkipper (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix bug Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/paint/DisplayItemList.cpp
diff --git a/Source/platform/graphics/paint/DisplayItemList.cpp b/Source/platform/graphics/paint/DisplayItemList.cpp
index ecff614061bf8af43a29f071b3b0343024db4298..ee2725863ab42b67128bbadcfde853b2c301746d 100644
--- a/Source/platform/graphics/paint/DisplayItemList.cpp
+++ b/Source/platform/graphics/paint/DisplayItemList.cpp
@@ -356,11 +356,7 @@ void DisplayItemList::checkCachedDisplayItemIsUnchanged(const DisplayItems::Item
{
ASSERT(RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled());
- if (!DisplayItem::isDrawingType(displayItem.type()) || !clientCacheIsValid(displayItem.client()))
- return;
-
- DrawingDisplayItem::UnderInvalidationCheckingMode mode = displayItem.underInvalidationCheckingMode();
- if (mode == DrawingDisplayItem::DontCheck)
+ if (!DisplayItem::isDrawingType(displayItem.type()) || displayItem.skippedCache() || !clientCacheIsValid(displayItem.client()))
return;
// If checking under-invalidation, we always generate new display item even if the client is not invalidated.
@@ -382,7 +378,7 @@ void DisplayItemList::checkCachedDisplayItemIsUnchanged(const DisplayItems::Item
if (!newPicture && !oldPicture)
return;
if (newPicture && oldPicture) {
- switch (mode) {
+ switch (displayItem.underInvalidationCheckingMode()) {
case DrawingDisplayItem::CheckPicture:
if (newPicture->approximateOpCount() == oldPicture->approximateOpCount()) {
SkDynamicMemoryWStream newPictureSerialized;
« no previous file with comments | « Source/core/paint/LayoutObjectDrawingRecorder.h ('k') | Source/platform/graphics/paint/DrawingDisplayItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698