Change DontCheck under-invalidation checking mode to CacheSkipper

Source/platform/graphics/paint/DisplayItemList.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 "config.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 
 #include "platform/NotImplemented.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
@@ skipping 338 matching lines @@
         }
     }
     bitmap.unlockPixels();
     return result;
 }
 
 void DisplayItemList::checkCachedDisplayItemIsUnchanged(const DisplayItems::ItemHandle& displayItem, DisplayItemIndicesByClientMap& displayItemIndicesByClient)
 {
     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.
     // Checks if the new picture is the same as the cached old picture. If the new picture is different but
     // the client is not invalidated, issue error about under-invalidation.
     size_t index = findMatchingItemFromIndex(displayItem.id(), displayItem.type(), displayItemIndicesByClient, m_currentDisplayItems);
     if (index == kNotFound) {
         showUnderInvalidationError("ERROR: under-invalidation: no cached display item", displayItem);
         ASSERT_NOT_REACHED();
         return;
     }
 
     DisplayItems::Iterator foundItem = m_currentDisplayItems.iteratorAt(index);
     RefPtr<const SkPicture> newPicture = displayItem.picture();
     RefPtr<const SkPicture> oldPicture = foundItem->picture();
     // Remove the display item from cache so that we can check if there are any remaining cached display items after merging.
     m_currentDisplayItems.setGone(foundItem);
 
     if (!newPicture && !oldPicture)
         return;
     if (newPicture && oldPicture) {
-        switch (mode) {
+        switch (displayItem.underInvalidationCheckingMode()) {
         case DrawingDisplayItem::CheckPicture:
             if (newPicture->approximateOpCount() == oldPicture->approximateOpCount()) {
                 SkDynamicMemoryWStream newPictureSerialized;
                 newPicture->serialize(&newPictureSerialized);
                 SkDynamicMemoryWStream oldPictureSerialized;
                 oldPicture->serialize(&oldPictureSerialized);
 
                 if (newPictureSerialized.bytesWritten() == oldPictureSerialized.bytesWritten()) {
                     RefPtr<SkData> oldData = adoptRef(oldPictureSerialized.copyToData());
                     RefPtr<SkData> newData = adoptRef(newPictureSerialized.copyToData());
@@ skipping 78 matching lines @@
 
 void DisplayItemList::replay(GraphicsContext& context) const
 {
     TRACE_EVENT0("blink,benchmark", "DisplayItemList::replay");
     ASSERT(m_newDisplayItems.isEmpty());
     for (auto& displayItem : m_currentDisplayItems)
         displayItem.replay(context);
 }
 
 } // namespace blink