First version of new merge algorithm (not enabled yet)

Source/platform/graphics/paint/DisplayItem.h

Index: Source/platform/graphics/paint/DisplayItem.h
diff --git a/Source/platform/graphics/paint/DisplayItem.h b/Source/platform/graphics/paint/DisplayItem.h
index f5546cc15a78efad55e037f1f22a836782aefa80..b71fa09a221bb1fced7c13c2df7a97a9e1f4262a 100644
--- a/Source/platform/graphics/paint/DisplayItem.h
+++ b/Source/platform/graphics/paint/DisplayItem.h
@@ -121,11 +121,22 @@ public:
         EndTransform,
         BeginClipPath,
         EndClipPath,
-    };
 
-    // Create a dummy display item which just holds the id but has no display operation.
-    // It helps a CachedDisplayItem to match the corresponding original empty display item.
-    static PassOwnPtr<DisplayItem> create(DisplayItemClient client, Type type) { return adoptPtr(new DisplayItem(client, type)); }
+        SubtreeCachedFirst,
+        SubtreeCachedPaintPhaseFirst = SubtreeCachedFirst,
+        SubtreeCachedPaintPhaseLast = SubtreeCachedPaintPhaseFirst + PaintPhaseMax,
+        SubtreeCachedLast = SubtreeCachedPaintPhaseLast,
+
+        BeginSubtreeFirst,
+        BeginSubtreePaintPhaseFirst = BeginSubtreeFirst,
+        BeginSubtreePaintPhaseLast = BeginSubtreePaintPhaseFirst + PaintPhaseMax,
+        BeginSubtreeLast = BeginSubtreePaintPhaseLast,
+
+        EndSubtreeFirst,
+        EndSubtreePaintPhaseFirst = EndSubtreeFirst,
+        EndSubtreePaintPhaseLast = EndSubtreePaintPhaseFirst + PaintPhaseMax,
+        EndSubtreeLast = EndSubtreePaintPhaseLast,
+    };
 
     virtual ~DisplayItem() { }
 
@@ -185,6 +196,16 @@ public:
     DEFINE_PAIRED_CATEGORY_METHODS(Scroll, scroll)
     DEFINE_PAINT_PHASE_CONVERSION_METHOD(Scroll)
 
+    DEFINE_CATEGORY_METHODS(SubtreeCached)
+    DEFINE_PAINT_PHASE_CONVERSION_METHOD(SubtreeCached)
+    DEFINE_CATEGORY_METHODS(BeginSubtree)
+    DEFINE_PAINT_PHASE_CONVERSION_METHOD(BeginSubtree)
+    DEFINE_CATEGORY_METHODS(EndSubtree)
+    DEFINE_PAINT_PHASE_CONVERSION_METHOD(EndSubtree)
+    DEFINE_CONVERSION_METHODS(SubtreeCached, subtreeCached, BeginSubtree, beginSubtree)
+    DEFINE_CONVERSION_METHODS(SubtreeCached, subtreeCached, EndSubtree, endSubtree)
+    DEFINE_CONVERSION_METHODS(BeginSubtree, beginSubtree, EndSubtree, endSubtree)
+
 #ifndef NDEBUG
     static WTF::String typeAsDebugString(DisplayItem::Type);