Revert of Reland Compile under-invalidation checking in all builds

third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.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/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 19 matching lines @@
     IntRect visualRect(const PaintArtifact& paintArtifact, size_t index)
     {
         return paintArtifact.getDisplayItemList().visualRect(index);
     }
 
 protected:
     PaintController& getPaintController() { return *m_paintController; }
 
     int numCachedNewItems() const { return m_paintController->m_numCachedNewItems; }
 
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     int numSequentialMatches() const { return m_paintController->m_numSequentialMatches; }
     int numOutOfOrderMatches() const { return m_paintController->m_numOutOfOrderMatches; }
     int numIndexedItems() const { return m_paintController->m_numIndexedItems; }
 #endif
 
     void TearDown() override
     {
         m_featuresBackup.restore();
     }
 
@@ skipping 46 matching lines @@
 
 void drawClippedRect(GraphicsContext& context, const FakeDisplayItemClient& client, DisplayItem::Type clipType, DisplayItem::Type drawingType, const FloatRect& bound)
 {
     ClipRecorder clipRecorder(context, client, clipType, IntRect(1, 1, 9, 9));
     drawRect(context, client, drawingType, bound);
 }
 
 enum TestConfigurations {
     SPv1,
     SPv2,
+#if DCHECK_IS_ON()
     UnderInvalidationCheckingSPv1,
     UnderInvalidationCheckingSPv2,
+#endif
 };
 
 // Tests using this class will be tested with under-invalidation-checking enabled and disabled.
 class PaintControllerTest : public PaintControllerTestBase, public testing::WithParamInterface<TestConfigurations> {
 public:
     PaintControllerTest()
         : m_rootPaintPropertyClient("root")
         , m_rootPaintChunkId(m_rootPaintPropertyClient, DisplayItem::kUninitializedType)
     { }
 
 protected:
     void SetUp() override
     {
         switch (GetParam()) {
         case SPv1:
             break;
         case SPv2:
             RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
             break;
+#if DCHECK_IS_ON()
         case UnderInvalidationCheckingSPv1:
-            RuntimeEnabledFeatures::setPaintUnderInvalidationCheckingEnabled(true);
+            RuntimeEnabledFeatures::setSlimmingPaintUnderInvalidationCheckingEnabled(true);
             break;
         case UnderInvalidationCheckingSPv2:
             RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
-            RuntimeEnabledFeatures::setPaintUnderInvalidationCheckingEnabled(true);
+            RuntimeEnabledFeatures::setSlimmingPaintUnderInvalidationCheckingEnabled(true);
             break;
+#endif
         }
     }
 
     FakeDisplayItemClient m_rootPaintPropertyClient;
     PaintChunk::Id m_rootPaintChunkId;
 };
 
+#if DCHECK_IS_ON()
 INSTANTIATE_TEST_CASE_P(All, PaintControllerTest, ::testing::Values(SPv1, SPv2, UnderInvalidationCheckingSPv1, UnderInvalidationCheckingSPv2));
+#else
+INSTANTIATE_TEST_CASE_P(All, PaintControllerTest, ::testing::Values(SPv1, SPv2));
+#endif
 
 TEST_P(PaintControllerTest, NestedRecorders)
 {
     GraphicsContext context(getPaintController());
     FakeDisplayItemClient client("client", LayoutRect(100, 100, 200, 200));
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
 
     drawClippedRect(context, client, clipType, backgroundDrawingType, FloatRect(100, 100, 200, 200));
     getPaintController().commitNewDisplayItems();
@@ skipping 36 matching lines @@
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
             FloatRect(LayoutRect::infiniteIntRect())));
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));
 
     EXPECT_EQ(2, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(2, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(1, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(first, foregroundDrawingType));
@@ skipping 33 matching lines @@
         TestDisplayItem(unaffected, foregroundDrawingType));
 
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, second, foregroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, unaffected, backgroundDrawingType, FloatRect(300, 300, 10, 10));
     drawRect(context, unaffected, foregroundDrawingType, FloatRect(300, 300, 10, 10));
 
     EXPECT_EQ(6, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(5, numSequentialMatches()); // second, first foreground, unaffected
     EXPECT_EQ(1, numOutOfOrderMatches()); // first
     EXPECT_EQ(2, numIndexedItems()); // first
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 6,
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType),
@@ skipping 40 matching lines @@
 
     first.setDisplayItemsUncached();
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, second, foregroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, unaffected, backgroundDrawingType, FloatRect(300, 300, 10, 10));
     drawRect(context, unaffected, foregroundDrawingType, FloatRect(300, 300, 10, 10));
 
     EXPECT_EQ(4, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(4, numSequentialMatches()); // second, unaffected
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(2, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 6,
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType),
@@ skipping 28 matching lines @@
         TestDisplayItem(second, backgroundDrawingType));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, third, backgroundDrawingType, FloatRect(125, 100, 200, 50));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
 
     EXPECT_EQ(2, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(2, numSequentialMatches()); // first, second
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(0, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(third, backgroundDrawingType),
@@ skipping 36 matching lines @@
 
     second.setDisplayItemsUncached();
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, third, backgroundDrawingType, FloatRect(300, 100, 50, 50));
     drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 100, 100));
     drawRect(context, second, foregroundDrawingType, FloatRect(100, 100, 50, 200));
     drawRect(context, third, foregroundDrawingType, FloatRect(300, 100, 50, 50));
 
     EXPECT_EQ(4, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(4, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(2, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 6,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType),
@@ skipping 52 matching lines @@
             FloatRect(200, 200, 50, 50), // Old bounds of |second|.
             FloatRect(150, 150, 100, 100))); // New bounds of |second|.
 
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
     }
 
     drawRect(context, second, backgroundDrawingType, FloatRect(150, 150, 100, 100));
     drawRect(context, second, foregroundDrawingType, FloatRect(150, 150, 100, 100));
 
     EXPECT_EQ(2, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(2, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(2, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(second, backgroundDrawingType),
         TestDisplayItem(second, foregroundDrawingType));
@@ skipping 97 matching lines @@
         TestDisplayItem(first, DisplayItem::clipTypeToEndClipType(clipType)));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         getPaintController().updateCurrentPaintChunkProperties(&m_rootPaintChunkId, PaintChunkProperties());
 
     first.setDisplayItemsUncached();
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 200, 200));
 
     EXPECT_EQ(1, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(1, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(1, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
@@ skipping 60 matching lines @@
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
     // The first display item should be updated.
     EXPECT_NE(firstPicture, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[0]).picture());
     // The second display item should be cached.
-    if (!RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled())
+    if (!RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled())
         EXPECT_EQ(secondPicture, static_cast<const DrawingDisplayItem&>(getPaintController().getDisplayItemList()[1]).picture());
     EXPECT_TRUE(getPaintController().clientCacheIsValid(first));
     EXPECT_TRUE(getPaintController().clientCacheIsValid(second));
 
     getPaintController().invalidateAll();
     EXPECT_FALSE(getPaintController().clientCacheIsValid(first));
     EXPECT_FALSE(getPaintController().clientCacheIsValid(second));
 }
 
 TEST_P(PaintControllerTest, ComplexUpdateSwapOrder)
@@ skipping 117 matching lines @@
         EXPECT_EQ(2u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
             FloatRect(LayoutRect::infiniteIntRect())));
         EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(
             FloatRect(LayoutRect::infiniteIntRect())));
     }
 
     // Simulate the situation when container1 e.g. gets a z-index that is now greater than container2.
-    if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
+    if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled()) {
         // When under-invalidation-checking is enabled, useCachedSubsequenceIfPossible is forced off,
         // and the client is expected to create the same painting as in the previous paint.
         EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2));
         {
             if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
                 PaintChunk::Id id(container2, backgroundDrawingType);
                 getPaintController().updateCurrentPaintChunkProperties(&id, container2Properties);
             }
             SubsequenceRecorder r(context, container2);
             drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
@@ skipping 12 matching lines @@
             drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
             drawRect(context, content1, foregroundDrawingType, FloatRect(100, 100, 50, 200));
             drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
         }
     } else {
         EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2));
         EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1));
     }
 
     EXPECT_EQ(12, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(1, numSequentialMatches());
     EXPECT_EQ(1, numOutOfOrderMatches());
     EXPECT_EQ(5, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 12,
         TestDisplayItem(container2, DisplayItem::kSubsequence),
         TestDisplayItem(container2, backgroundDrawingType),
@@ skipping 155 matching lines @@
             getPaintController().updateCurrentPaintChunkProperties(&id, content2Properties);
         }
         SubsequenceRecorder r(context, content2);
         drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
     }
     // Repaint container1 with foreground only.
     {
         EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1));
         SubsequenceRecorder r(context, container1);
         // Use cached subsequence of content1.
-        if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
+        if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled()) {
             // When under-invalidation-checking is enabled, useCachedSubsequenceIfPossible is forced off,
             // and the client is expected to create the same painting as in the previous paint.
             EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content1));
             if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
                 PaintChunk::Id id(content1, backgroundDrawingType);
                 getPaintController().updateCurrentPaintChunkProperties(&id, content1Properties);
             }
             SubsequenceRecorder r(context, content1);
             drawRect(context, content1, backgroundDrawingType, FloatRect(100, 100, 50, 200));
             drawRect(context, content1, foregroundDrawingType, FloatRect(100, 100, 50, 200));
         } else {
             EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content1));
         }
         if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
             PaintChunk::Id id(container1, foregroundDrawingType);
             getPaintController().updateCurrentPaintChunkProperties(&id, container1ForegroundProperties);
         }
         drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
     }
 
     EXPECT_EQ(4, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(1, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(2, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 10,
         TestDisplayItem(content2, DisplayItem::kSubsequence),
         TestDisplayItem(content2, foregroundDrawingType),
@@ skipping 67 matching lines @@
     // Draw again with nothing invalidated.
     EXPECT_TRUE(getPaintController().clientCacheIsValid(multicol));
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
 
     getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect1);
     drawRect(context, content, foregroundDrawingType, rect2);
     getPaintController().endSkippingCache();
 
     EXPECT_EQ(1, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(1, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(0, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
@@ skipping 72 matching lines @@
     EXPECT_EQ(PaintInvalidationFull, content.getPaintInvalidationReason());
 
     // Draw again with nothing invalidated.
     drawRect(context, content, backgroundDrawingType, rect1);
     getPaintController().beginSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect2);
     getPaintController().endSkippingCache();
     drawRect(context, content, foregroundDrawingType, rect3);
 
     EXPECT_EQ(0, numCachedNewItems());
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
     EXPECT_EQ(0, numSequentialMatches());
     EXPECT_EQ(0, numOutOfOrderMatches());
     EXPECT_EQ(0, numIndexedItems());
 #endif
 
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
         TestDisplayItem(content, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
@@ skipping 215 matching lines @@
         for (int j = 0; j < 50; ++j)
             getPaintController().createAndAppend<BeginClipPathDisplayItem>(client, path);
         drawRect(context, client, backgroundDrawingType, FloatRect(0, 0, 100, 100));
         for (int j = 0; j < 50; ++j)
             getPaintController().createAndAppend<EndClipPathDisplayItem>(client);
         getPaintController().commitNewDisplayItems(LayoutSize());
         EXPECT_FALSE(getPaintController().paintArtifact().isSuitableForGpuRasterization());
     }
 }
 
+// Under-invalidation checking is only available when DCHECK_IS_ON().
 // Death tests don't work properly on Android.
-#if defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
+#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 class PaintControllerUnderInvalidationTest : public PaintControllerTestBase {
 protected:
     void SetUp() override
     {
         PaintControllerTestBase::SetUp();
-        RuntimeEnabledFeatures::setPaintUnderInvalidationCheckingEnabled(true);
+        RuntimeEnabledFeatures::setSlimmingPaintUnderInvalidationCheckingEnabled(true);
     }
 
     void testChangeDrawing()
     {
         FakeDisplayItemClient first("first");
         GraphicsContext context(getPaintController());
 
         drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));
         drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));
         getPaintController().commitNewDisplayItems();
@@ skipping 248 matching lines @@
     // We allow invalidated display item clients as long as they would produce the same display items.
     // The cases of changed display items are tested by other test cases.
     testInvalidationInSubsequence();
 }
 
 TEST_F(PaintControllerUnderInvalidationTest, FoldCompositingDrawingInSubsequence)
 {
     testFoldCompositingDrawingInSubsequence();
 }
 
-#endif // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
+#endif // DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 } // namespace blink