Rename DisplayItem::Type enum constants to Chromium style.

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 35 matching lines @@
     void TearDown() override
     {
         m_featuresBackup.restore();
     }
 
 private:
     std::unique_ptr<PaintController> m_paintController;
     RuntimeEnabledFeatures::Backup m_featuresBackup;
 };
 
-const DisplayItem::Type foregroundDrawingType = static_cast<DisplayItem::Type>(DisplayItem::DrawingPaintPhaseFirst + 4);
-const DisplayItem::Type backgroundDrawingType = DisplayItem::DrawingPaintPhaseFirst;
-const DisplayItem::Type clipType = DisplayItem::ClipFirst;
+const DisplayItem::Type foregroundDrawingType = static_cast<DisplayItem::Type>(DisplayItem::kDrawingPaintPhaseFirst + 4);
+const DisplayItem::Type backgroundDrawingType = DisplayItem::kDrawingPaintPhaseFirst;
+const DisplayItem::Type clipType = DisplayItem::kClipFirst;
 
 class TestDisplayItem final : public DisplayItem {
 public:
     TestDisplayItem(const FakeDisplayItemClient& client, Type type) : DisplayItem(client, type, sizeof(*this)) { }
 
     void replay(GraphicsContext&) const final { ASSERT_NOT_REACHED(); }
     void appendToWebDisplayItemList(const IntRect&, WebDisplayItemList*) const final { ASSERT_NOT_REACHED(); }
 };
 
 #ifndef NDEBUG
@@ skipping 39 matching lines @@
     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::UninitializedType)
+        , m_rootPaintChunkId(m_rootPaintPropertyClient, DisplayItem::kUninitializedType)
     { }
 
 protected:
     void SetUp() override
     {
         switch (GetParam()) {
         case SPv1:
             break;
         case SPv2:
             RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
@@ skipping 674 matching lines @@
         }
         SubsequenceRecorder r(context, container2);
         drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
         drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
         drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
         drawRect(context, container2, foregroundDrawingType, FloatRect(100, 200, 100, 100));
     }
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 12,
-        TestDisplayItem(container1, DisplayItem::Subsequence),
+        TestDisplayItem(container1, DisplayItem::kSubsequence),
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, DisplayItem::EndSubsequence),
+        TestDisplayItem(container1, DisplayItem::kEndSubsequence),
 
-        TestDisplayItem(container2, DisplayItem::Subsequence),
+        TestDisplayItem(container2, DisplayItem::kSubsequence),
         TestDisplayItem(container2, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
-        TestDisplayItem(container2, DisplayItem::EndSubsequence));
+        TestDisplayItem(container2, DisplayItem::kEndSubsequence));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         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())));
     }
@@ skipping 34 matching lines @@
     EXPECT_EQ(12, numCachedNewItems());
 #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::Subsequence),
+        TestDisplayItem(container2, DisplayItem::kSubsequence),
         TestDisplayItem(container2, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
-        TestDisplayItem(container2, DisplayItem::EndSubsequence),
+        TestDisplayItem(container2, DisplayItem::kEndSubsequence),
 
-        TestDisplayItem(container1, DisplayItem::Subsequence),
+        TestDisplayItem(container1, DisplayItem::kSubsequence),
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, DisplayItem::EndSubsequence));
+        TestDisplayItem(container1, DisplayItem::kEndSubsequence));
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
     DisplayItemClient::endShouldKeepAliveAllClients();
 #endif
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(2u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         // Swapping order of chunks should not invalidate anything.
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre());
         EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre());
     }
 }
 
 TEST_P(PaintControllerTest, OutOfOrderNoCrash)
 {
     FakeDisplayItemClient client("client");
     GraphicsContext context(getPaintController());
 
-    const DisplayItem::Type type1 = DisplayItem::DrawingFirst;
-    const DisplayItem::Type type2 = static_cast<DisplayItem::Type>(DisplayItem::DrawingFirst + 1);
-    const DisplayItem::Type type3 = static_cast<DisplayItem::Type>(DisplayItem::DrawingFirst + 2);
-    const DisplayItem::Type type4 = static_cast<DisplayItem::Type>(DisplayItem::DrawingFirst + 3);
+    const DisplayItem::Type type1 = DisplayItem::kDrawingFirst;
+    const DisplayItem::Type type2 = static_cast<DisplayItem::Type>(DisplayItem::kDrawingFirst + 1);
+    const DisplayItem::Type type3 = static_cast<DisplayItem::Type>(DisplayItem::kDrawingFirst + 2);
+    const DisplayItem::Type type4 = static_cast<DisplayItem::Type>(DisplayItem::kDrawingFirst + 3);
 
     drawRect(context, client, type1, FloatRect(100, 100, 100, 100));
     drawRect(context, client, type2, FloatRect(100, 100, 50, 200));
     drawRect(context, client, type3, FloatRect(100, 100, 50, 200));
     drawRect(context, client, type4, FloatRect(100, 100, 100, 100));
 
     getPaintController().commitNewDisplayItems();
 
     drawRect(context, client, type2, FloatRect(100, 100, 50, 200));
     drawRect(context, client, type3, FloatRect(100, 100, 50, 200));
@@ skipping 56 matching lines @@
                 content2Properties.effect = EffectPaintPropertyNode::create(nullptr, 0.8);
                 getPaintController().updateCurrentPaintChunkProperties(&id, content2Properties);
             }
             SubsequenceRecorder r(context, content2);
             drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
         }
     }
     getPaintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 14,
-        TestDisplayItem(container1, DisplayItem::Subsequence),
+        TestDisplayItem(container1, DisplayItem::kSubsequence),
         TestDisplayItem(container1, backgroundDrawingType),
-        TestDisplayItem(content1, DisplayItem::Subsequence),
+        TestDisplayItem(content1, DisplayItem::kSubsequence),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
-        TestDisplayItem(content1, DisplayItem::EndSubsequence),
+        TestDisplayItem(content1, DisplayItem::kEndSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, DisplayItem::EndSubsequence),
+        TestDisplayItem(container1, DisplayItem::kEndSubsequence),
 
-        TestDisplayItem(container2, DisplayItem::Subsequence),
+        TestDisplayItem(container2, DisplayItem::kSubsequence),
         TestDisplayItem(container2, backgroundDrawingType),
-        TestDisplayItem(content2, DisplayItem::Subsequence),
+        TestDisplayItem(content2, DisplayItem::kSubsequence),
         TestDisplayItem(content2, backgroundDrawingType),
-        TestDisplayItem(content2, DisplayItem::EndSubsequence),
-        TestDisplayItem(container2, DisplayItem::EndSubsequence));
+        TestDisplayItem(content2, DisplayItem::kEndSubsequence),
+        TestDisplayItem(container2, DisplayItem::kEndSubsequence));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(5u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(container1, backgroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(content1, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         EXPECT_EQ(PaintChunk::Id(container1, foregroundDrawingType), getPaintController().paintChunks()[2].id);
         EXPECT_EQ(PaintChunk::Id(container2, backgroundDrawingType), getPaintController().paintChunks()[3].id);
         EXPECT_EQ(PaintChunk::Id(content2, backgroundDrawingType), getPaintController().paintChunks()[4].id);
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
         EXPECT_THAT(getPaintController().paintChunks()[1].rasterInvalidationRects, UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
@@ skipping 50 matching lines @@
     EXPECT_EQ(4, numCachedNewItems());
 #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::Subsequence),
+        TestDisplayItem(content2, DisplayItem::kSubsequence),
         TestDisplayItem(content2, foregroundDrawingType),
-        TestDisplayItem(content2, DisplayItem::EndSubsequence),
+        TestDisplayItem(content2, DisplayItem::kEndSubsequence),
 
-        TestDisplayItem(container1, DisplayItem::Subsequence),
-        TestDisplayItem(content1, DisplayItem::Subsequence),
+        TestDisplayItem(container1, DisplayItem::kSubsequence),
+        TestDisplayItem(content1, DisplayItem::kSubsequence),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
-        TestDisplayItem(content1, DisplayItem::EndSubsequence),
+        TestDisplayItem(content1, DisplayItem::kEndSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, DisplayItem::EndSubsequence));
+        TestDisplayItem(container1, DisplayItem::kEndSubsequence));
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         EXPECT_EQ(3u, getPaintController().paintChunks().size());
         EXPECT_EQ(PaintChunk::Id(content2, foregroundDrawingType), getPaintController().paintChunks()[0].id);
         EXPECT_EQ(PaintChunk::Id(content1, backgroundDrawingType), getPaintController().paintChunks()[1].id);
         EXPECT_EQ(PaintChunk::Id(container1, foregroundDrawingType), getPaintController().paintChunks()[2].id);
         // This is a new chunk.
         EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects, UnorderedElementsAre(
             FloatRect(LayoutRect::infiniteIntRect())));
         // This chunk didn't change.
@@ skipping 175 matching lines @@
     drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
     {
         ClipPathRecorder clipRecorder(context, second, Path());
         drawRect(context, second, backgroundDrawingType, FloatRect(0, 0, 100, 100));
     }
     drawRect(context, third, backgroundDrawingType, FloatRect(0, 0, 100, 100));
 
     getPaintController().commitNewDisplayItems();
     EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 5,
         TestDisplayItem(first, backgroundDrawingType),
-        TestDisplayItem(second, DisplayItem::BeginClipPath),
+        TestDisplayItem(second, DisplayItem::kBeginClipPath),
         TestDisplayItem(second, backgroundDrawingType),
-        TestDisplayItem(second, DisplayItem::EndClipPath),
+        TestDisplayItem(second, DisplayItem::kEndClipPath),
         TestDisplayItem(third, backgroundDrawingType));
 
     drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
     {
         ClipRecorder clipRecorder(context, second, clipType, IntRect(1, 1, 2, 2));
         // Do not draw anything for second.
     }
     drawRect(context, third, backgroundDrawingType, FloatRect(0, 0, 100, 100));
     getPaintController().commitNewDisplayItems();
 
@@ skipping 460 matching lines @@
 }
 
 TEST_F(PaintControllerUnderInvalidationTest, FoldCompositingDrawingInSubsequence)
 {
     testFoldCompositingDrawingInSubsequence();
 }
 
 #endif // DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 } // namespace blink