Generate scroll/clip display item hierarchy for SPv2

Source/core/paint/LayerClipRecorder.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 "core/paint/LayerClipRecorder.h"
 
 #include "core/layout/ClipRect.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/DeprecatedPaintLayer.h"
@@ skipping 21 matching lines @@
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         if (m_graphicsContext.displayItemList()->displayItemConstructionIsDisabled())
             return;
         m_graphicsContext.displayItemList()->createAndAppend<ClipDisplayItem>(layoutObject, m_clipType, snappedClipRect, roundedRects);
     } else {
         ClipDisplayItem clipDisplayItem(layoutObject, m_clipType, snappedClipRect, roundedRects);
         clipDisplayItem.replay(graphicsContext);
     }
 }
 
+LayerClipRecorder::LayerClipRecorder(GraphicsContext& context, const LayoutBox& layoutBox, const LayoutPoint& paintOffset)
+    : m_graphicsContext(context)
+    , m_layoutObject(layoutBox)
+    , m_clipType(DisplayItem::ClipDescendantStackingContext)
+{
+    ASSERT(layoutBox.hasOverflowClip());

[pdr., 2015/09/03 06:16:59]

Can you assert spv2 here?
ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());

Similarly, in the other constructor can you assert that spv2 is not enabled?

[trchen, 2015/09/04 06:10:15]

Done.

+
+    LayoutRect clipRect = layoutBox.overflowClipRect(paintOffset);
+    Vector<FloatRoundedRect> roundedRects;
+    if (layoutBox.style()->hasBorderRadius())
+        roundedRects.append(layoutBox.style()->getRoundedInnerBorderFor(LayoutRect(paintOffset, layoutBox.size())));
+
+    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
+        if (m_graphicsContext.displayItemList()->displayItemConstructionIsDisabled())
+            return;
+        m_graphicsContext.displayItemList()->createAndAppend<ClipDisplayItem>(m_layoutObject, m_clipType, pixelSnappedIntRect(clipRect), roundedRects);
+    } else {
+        ClipDisplayItem clipDisplayItem(m_layoutObject, m_clipType, pixelSnappedIntRect(clipRect), roundedRects);
+        clipDisplayItem.replay(m_graphicsContext);
+    }
+}
+
 static bool inContainingBlockChain(DeprecatedPaintLayer* startLayer, DeprecatedPaintLayer* endLayer)
 {
     if (startLayer == endLayer)
         return true;
 
     LayoutView* view = startLayer->layoutObject()->view();
     for (LayoutBlock* currentBlock = startLayer->layoutObject()->containingBlock(); currentBlock && currentBlock != view; currentBlock = currentBlock->containingBlock()) {
         if (currentBlock->layer() == endLayer)
             return true;
     }
@@ skipping 35 matching lines @@
                 m_graphicsContext.displayItemList()->removeLastDisplayItem();
             else
                 m_graphicsContext.displayItemList()->createAndAppend<EndClipDisplayItem>(m_layoutObject, DisplayItem::clipTypeToEndClipType(m_clipType));
         }
     } else {
         m_graphicsContext.restore();
     }
 }
 
 } // namespace blink