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

third_party/WebKit/Source/core/paint/PaintLayer.h

Index: third_party/WebKit/Source/core/paint/PaintLayer.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.h b/third_party/WebKit/Source/core/paint/PaintLayer.h
index 4b47a60f6b8c037eafdd3e9489a0d3542a69666c..00f50acd7ed217b41026d20b9dc5eaa4045f8afc 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
@@ -616,8 +616,14 @@ public:
     IntSize previousScrollOffsetAccumulationForPainting() const { return m_previousScrollOffsetAccumulationForPainting; }
     void setPreviousScrollOffsetAccumulationForPainting(const IntSize& s) { m_previousScrollOffsetAccumulationForPainting = s; }
 
-    // For subsequence display items.
-    DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
+    DisplayItemClientWrapper displayItemClientForNegativeZOrderChildren() const

[chrishtr, 2015/11/04 23:37:11]

Don't inline these.

+    {
+        return DisplayItemClientWrapper(*this, toSubDisplayItemClient<1>(this), debugNameForNegativeZOrderChildrenDisplayItemClient);
+    }
+    DisplayItemClientWrapper displayItemClientForNormalAndPositiveZOrderChildren() const
+    {
+        return DisplayItemClientWrapper(*this, toSubDisplayItemClient<2>(this), debugNameForNormalAndPositiveZOrderChildrenDisplayItemClient);
+    }
 
 private:
     // Bounding box in the coordinates of this layer.
@@ -693,6 +699,9 @@ private:
 
     void markCompositingContainerChainForNeedsRepaint();
 
+    static String debugNameForNegativeZOrderChildrenDisplayItemClient(const PaintLayer& layer) { return layer.debugName() + " negative z-order children"; }
+    static String debugNameForNormalAndPositiveZOrderChildrenDisplayItemClient(const PaintLayer& layer) { return layer.debugName() + " normal and positive z-order children"; }
+
     PaintLayerType m_layerType;
 
     // Self-painting layer is an optimization where we avoid the heavy Layer painting