Separate display item clients for negative and normal/positive z-order children

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 "config.h"
 #include "platform/graphics/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/CachedDisplayItem.h"
@@ skipping 24 matching lines @@
     }
 
     OwnPtr<PaintController> m_paintController;
     bool m_originalSlimmingPaintSynchronizedPaintingEnabled;
     bool m_originalSlimmingPaintV2Enabled;
 };
 
 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 subsequenceType = DisplayItem::SubsequenceNormalFlowAndPositiveZOrder;
-const DisplayItem::Type endSubsequenceType = DisplayItem::subsequenceTypeToEndSubsequenceType(subsequenceType);
-const DisplayItem::Type cachedSubsequenceType = DisplayItem::subsequenceTypeToCachedSubsequenceType(subsequenceType);
 
 class TestDisplayItemClient {
 public:
     TestDisplayItemClient(const String& name)
         : m_name(name)
     { }
 
-    DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
+    DisplayItemClient displayItemClient() const { return DisplayItemClient(this); }
     String debugName() const { return m_name; }
 
 private:
     String m_name;
 };
 
 class TestDisplayItem final : public DisplayItem {
 public:
     TestDisplayItem(const TestDisplayItemClient& client, Type type) : DisplayItem(client, type, sizeof(*this)) { }
 
@@ skipping 390 matching lines @@
 {
     RuntimeEnabledFeatures::setSlimmingPaintSynchronizedPaintingEnabled(true);
 
     TestDisplayItemClient container1("container1");
     TestDisplayItemClient content1("content1");
     TestDisplayItemClient container2("container2");
     TestDisplayItemClient content2("content2");
     GraphicsContext context(paintController());
 
     {
-        SubsequenceRecorder r(context, container1, subsequenceType);
+        SubsequenceRecorder r(context, container1);
         drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
         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));
     }
     {
-        SubsequenceRecorder r(context, container2, subsequenceType);
+        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));
     }
     paintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 12,
-        TestDisplayItem(container1, subsequenceType),
+        TestDisplayItem(container1, DisplayItem::Subsequence),
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, endSubsequenceType),
+        TestDisplayItem(container1, DisplayItem::EndSubsequence),
 
-        TestDisplayItem(container2, subsequenceType),
+        TestDisplayItem(container2, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
-        TestDisplayItem(container2, endSubsequenceType));
+        TestDisplayItem(container2, DisplayItem::EndSubsequence));
 
     // Simulate the situation when container1 e.g. gets a z-index that is now greater than container2.
-    EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2, subsequenceType));
-    EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1, subsequenceType));
+    EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2));
+    EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1));
 
     EXPECT_DISPLAY_LIST(paintController().newDisplayItemList(), 2,
-        TestDisplayItem(container2, cachedSubsequenceType),
-        TestDisplayItem(container1, cachedSubsequenceType));
+        TestDisplayItem(container2, DisplayItem::CachedSubsequence),
+        TestDisplayItem(container1, DisplayItem::CachedSubsequence));
 
     paintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 12,
-        TestDisplayItem(container2, subsequenceType),
+        TestDisplayItem(container2, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundDrawingType),
         TestDisplayItem(content2, backgroundDrawingType),
         TestDisplayItem(content2, foregroundDrawingType),
         TestDisplayItem(container2, foregroundDrawingType),
-        TestDisplayItem(container2, endSubsequenceType),
+        TestDisplayItem(container2, DisplayItem::EndSubsequence),
 
-        TestDisplayItem(container1, subsequenceType),
+        TestDisplayItem(container1, DisplayItem::Subsequence),
         TestDisplayItem(container1, backgroundDrawingType),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, endSubsequenceType));
+        TestDisplayItem(container1, DisplayItem::EndSubsequence));
 }
 
 TEST_F(PaintControllerTest, OutOfOrderNoCrash)
 {
     TestDisplayItemClient client("client");
     GraphicsContext context(paintController());
 
     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);
@@ skipping 18 matching lines @@
 {
     RuntimeEnabledFeatures::setSlimmingPaintSynchronizedPaintingEnabled(true);
 
     TestDisplayItemClient container1("container1");
     TestDisplayItemClient content1("content1");
     TestDisplayItemClient container2("container2");
     TestDisplayItemClient content2("content2");
     GraphicsContext context(paintController());
 
     {
-        SubsequenceRecorder r(context, container1, subsequenceType);
+        SubsequenceRecorder r(context, container1);
         drawRect(context, container1, backgroundDrawingType, FloatRect(100, 100, 100, 100));
         {
-            SubsequenceRecorder r(context, content1, subsequenceType);
+            SubsequenceRecorder r(context, content1);
             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));
     }
     {
-        SubsequenceRecorder r(context, container2, subsequenceType);
+        SubsequenceRecorder r(context, container2);
         drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));
         {
-            SubsequenceRecorder r(context, content2, subsequenceType);
+            SubsequenceRecorder r(context, content2);
             drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));
         }
     }
     paintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 14,
-        TestDisplayItem(container1, subsequenceType),
+        TestDisplayItem(container1, DisplayItem::Subsequence),
         TestDisplayItem(container1, backgroundDrawingType),
-        TestDisplayItem(content1, subsequenceType),
+        TestDisplayItem(content1, DisplayItem::Subsequence),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
-        TestDisplayItem(content1, endSubsequenceType),
+        TestDisplayItem(content1, DisplayItem::EndSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, endSubsequenceType),
+        TestDisplayItem(container1, DisplayItem::EndSubsequence),
 
-        TestDisplayItem(container2, subsequenceType),
+        TestDisplayItem(container2, DisplayItem::Subsequence),
         TestDisplayItem(container2, backgroundDrawingType),
-        TestDisplayItem(content2, subsequenceType),
+        TestDisplayItem(content2, DisplayItem::Subsequence),
         TestDisplayItem(content2, backgroundDrawingType),
-        TestDisplayItem(content2, endSubsequenceType),
-        TestDisplayItem(container2, endSubsequenceType));
+        TestDisplayItem(content2, DisplayItem::EndSubsequence),
+        TestDisplayItem(container2, DisplayItem::EndSubsequence));
 
     // Invalidate container1 but not content1.
     paintController().invalidate(container1, PaintInvalidationFull, nullptr);
 
     // Container2 itself now becomes empty (but still has the 'content2' child),
     // and chooses not to output subsequence info.
 
     paintController().invalidate(container2, PaintInvalidationFull, nullptr);
     paintController().invalidate(content2, PaintInvalidationFull, nullptr);
-    EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2, subsequenceType));
-    EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content2, subsequenceType));
+    EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2));
+    EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content2));
     // Content2 now outputs foreground only.
     {
-        SubsequenceRecorder r(context, content2, subsequenceType);
+        SubsequenceRecorder r(context, content2);
         drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));
     }
     // Repaint container1 with foreground only.
     {
-        EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1, subsequenceType));
-        SubsequenceRecorder r(context, container1, subsequenceType);
+        EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container1));
+        SubsequenceRecorder r(context, container1);
         // Use cached subsequence of content1.
-        EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content1, subsequenceType));
+        EXPECT_TRUE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content1));
         drawRect(context, container1, foregroundDrawingType, FloatRect(100, 100, 100, 100));
     }
     EXPECT_DISPLAY_LIST(paintController().newDisplayItemList(), 7,
-        TestDisplayItem(content2, subsequenceType),
+        TestDisplayItem(content2, DisplayItem::Subsequence),
         TestDisplayItem(content2, foregroundDrawingType),
-        TestDisplayItem(content2, endSubsequenceType),
-        TestDisplayItem(container1, subsequenceType),
-        TestDisplayItem(content1, cachedSubsequenceType),
+        TestDisplayItem(content2, DisplayItem::EndSubsequence),
+        TestDisplayItem(container1, DisplayItem::Subsequence),
+        TestDisplayItem(content1, DisplayItem::CachedSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, endSubsequenceType));
+        TestDisplayItem(container1, DisplayItem::EndSubsequence));
 
     paintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 10,
-        TestDisplayItem(content2, subsequenceType),
+        TestDisplayItem(content2, DisplayItem::Subsequence),
         TestDisplayItem(content2, foregroundDrawingType),
-        TestDisplayItem(content2, endSubsequenceType),
+        TestDisplayItem(content2, DisplayItem::EndSubsequence),
 
-        TestDisplayItem(container1, subsequenceType),
-        TestDisplayItem(content1, subsequenceType),
+        TestDisplayItem(container1, DisplayItem::Subsequence),
+        TestDisplayItem(content1, DisplayItem::Subsequence),
         TestDisplayItem(content1, backgroundDrawingType),
         TestDisplayItem(content1, foregroundDrawingType),
-        TestDisplayItem(content1, endSubsequenceType),
+        TestDisplayItem(content1, DisplayItem::EndSubsequence),
         TestDisplayItem(container1, foregroundDrawingType),
-        TestDisplayItem(container1, endSubsequenceType));
+        TestDisplayItem(container1, DisplayItem::EndSubsequence));
 }
 
 TEST_F(PaintControllerTest, Scope)
 {
     TestDisplayItemClient multicol("multicol");
     TestDisplayItemClient content("content");
     GraphicsContext context(paintController());
 
     FloatRect rect1(100, 100, 50, 50);
     FloatRect rect2(150, 100, 50, 50);
@@ skipping 134 matching lines @@
     drawRect(context, client, backgroundDrawingType, FloatRect(0, 0, 100, 100));
 
     paintController().commitNewDisplayItems();
     const auto& paintChunks = paintController().paintChunks();
     ASSERT_EQ(1u, paintChunks.size());
     EXPECT_EQ(0u, paintChunks[0].beginIndex);
     EXPECT_EQ(1u, paintChunks[0].endIndex);
 }
 
 } // namespace blink