| Index: third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
|
| index 4bdc06b35a5bcb71b1adc93d9bf54dbe4fffc826..5d9d39d7d4b3a543c444c81caf86a8ecbfd3f0cf 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
|
| @@ -223,11 +223,6 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceForSVGRoot) {
|
| LayoutObject& rect = *document().getElementById("rect")->layoutObject();
|
| LayoutObject& div = *document().getElementById("div")->layoutObject();
|
|
|
| - DisplayItem::Type clipBoxBegin =
|
| - DisplayItem::paintPhaseToClipBoxType(PaintPhaseForeground);
|
| - DisplayItem::Type clipBoxEnd =
|
| - DisplayItem::clipTypeToEndClipType(clipBoxBegin);
|
| -
|
| if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
|
| if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
|
| // SPv2 slips the clip box (see BoxClipper).
|
| @@ -269,11 +264,12 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceForSVGRoot) {
|
| TestDisplayItem(layoutView(), documentBackgroundType),
|
| TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
|
| TestDisplayItem(svgLayer, DisplayItem::kSubsequence),
|
| - TestDisplayItem(svg, clipBoxBegin),
|
| + TestDisplayItem(svg, DisplayItem::kClipLayerForeground),
|
| TestDisplayItem(svg, DisplayItem::kBeginTransform),
|
| TestDisplayItem(rect, foregroundType),
|
| TestDisplayItem(svg, DisplayItem::kEndTransform),
|
| - TestDisplayItem(svg, clipBoxEnd),
|
| + TestDisplayItem(svg, DisplayItem::clipTypeToEndClipType(
|
| + DisplayItem::kClipLayerForeground)),
|
| TestDisplayItem(svgLayer, DisplayItem::kEndSubsequence),
|
| TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
|
| }
|
| @@ -337,11 +333,12 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceForSVGRoot) {
|
| TestDisplayItem(layoutView(), documentBackgroundType),
|
| TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
|
| TestDisplayItem(svgLayer, DisplayItem::kSubsequence),
|
| - TestDisplayItem(svg, clipBoxBegin),
|
| + TestDisplayItem(svg, DisplayItem::kClipLayerForeground),
|
| TestDisplayItem(svg, DisplayItem::kBeginTransform),
|
| TestDisplayItem(rect, foregroundType),
|
| TestDisplayItem(svg, DisplayItem::kEndTransform),
|
| - TestDisplayItem(svg, clipBoxEnd),
|
| + TestDisplayItem(svg, DisplayItem::clipTypeToEndClipType(
|
| + DisplayItem::kClipLayerForeground)),
|
| TestDisplayItem(svgLayer, DisplayItem::kEndSubsequence),
|
| TestDisplayItem(div, backgroundType),
|
| TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
|
|
|