Avoid false-positives of under-invalidation checking

Source/platform/graphics/paint/DrawingRecorder.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/DrawingRecorder.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/CachedDisplayItem.h"
 #include "platform/graphics/paint/DisplayItemList.h"
-#include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace blink {
 
 DrawingRecorder::DrawingRecorder(GraphicsContext& context, const DisplayItemClientWrapper& displayItemClient, DisplayItem::Type displayItemType, const FloatRect& cullRect)
     : m_context(context)
     , m_displayItemClient(displayItemClient)
     , m_displayItemType(displayItemType)
     , m_canUseCachedDrawing(false)
 #if ENABLE(ASSERT)
     , m_checkedCachedDrawing(false)
     , m_displayItemPosition(RuntimeEnabledFeatures::slimmingPaintEnabled() ? m_context.displayItemList()->newDisplayItemsSize() : 0)
-    , m_skipUnderInvalidationChecking(false)
+    , m_underInvalidationCheckingMode(DrawingDisplayItem::CheckPicture)
 #endif
 {
     if (!RuntimeEnabledFeatures::slimmingPaintEnabled())
         return;
 
     ASSERT(context.displayItemList());
     if (context.displayItemList()->displayItemConstructionIsDisabled())
         return;
 
     ASSERT(DisplayItem::isDrawingType(displayItemType));
@@ skipping 46 matching lines @@
         RefPtr<const SkPicture> picture = m_context.endRecording();
         if (picture && picture->approximateOpCount()) {
             WTF_LOG_ERROR("Unnecessary painting for %s\n. Should check recorder.canUseCachedDrawing() before painting",
                 m_displayItemClient.debugName().utf8().data());
         }
 #endif
         m_context.displayItemList()->add(CachedDisplayItem::create(m_displayItemClient, DisplayItem::drawingTypeToCachedType(m_displayItemType)));
     } else {
         OwnPtr<DrawingDisplayItem> drawingDisplayItem = DrawingDisplayItem::create(m_displayItemClient, m_displayItemType, m_context.endRecording());
 #if ENABLE(ASSERT)
-        if (m_skipUnderInvalidationChecking)
-            drawingDisplayItem->setSkipUnderInvalidationChecking();
+        drawingDisplayItem->setUnderInvalidationCheckingMode(m_underInvalidationCheckingMode);
 #endif
         m_context.displayItemList()->add(drawingDisplayItem.release());
     }
 }
 
 } // namespace blink