[Slimming Paint] Track clip renderers

Source/core/paint/ViewDisplayListTest.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/ViewDisplayList.h"
 
 #include "core/paint/ClipRecorder.h"
 #include "core/paint/DrawingRecorder.h"
 #include "core/rendering/RenderView.h"
@@ skipping 30 matching lines @@
 {
     DrawingRecorder drawingRecorder(context, renderer, phase, bound);
     IntRect rect(0, 0, 10, 10);
     context->drawRect(rect);
 }
 
 void drawClippedRect(GraphicsContext* context, RenderView* renderView, PaintPhase phase, const FloatRect& bound)
 {
     IntRect rect(1, 1, 9, 9);
     ClipRect clipRect(rect);
-    ClipRecorder clipRecorder(renderView->compositor()->rootRenderLayer(), context, DisplayItem::ClipLayerForeground, clipRect);
+    ClipRecorder clipRecorder(renderView->compositor()->rootRenderLayer()->renderer(), context, DisplayItem::ClipLayerForeground, clipRect);
     drawRect(context, renderView, phase, bound);
 }
 
 TEST_F(ViewDisplayListTest, ViewDisplayListTest_NestedRecorders)
 {
     GraphicsContext* context = new GraphicsContext(nullptr);
     FloatRect bound = renderView()->viewRect();
 
     drawClippedRect(context, renderView(), PaintPhaseForeground, bound);
     EXPECT_EQ((size_t)3, renderView()->viewDisplayList().paintList().size());
@@ skipping 266 matching lines @@
     renderView()->viewDisplayList().invalidate(second);
     drawRect(context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     drawRect(context, first, PaintPhaseOutline, FloatRect(100, 100, 150, 150));
 
     const PaintList& thirdList = renderView()->viewDisplayList().paintList();
     EXPECT_EQ((size_t)2, thirdList.size());
     EXPECT_EQ(first, thirdList[0]->renderer());
     EXPECT_EQ(first, thirdList[1]->renderer());
 }
 
+TEST_F(ViewDisplayListTest, ViewDisplayListTest_UpdateClip)
+{
+    setBodyInnerHTML("<div id='first'><div id='second'></div></div>");
+    RenderLayerModelObject* firstRenderer = toRenderLayerModelObject(document().body()->firstChild()->renderer());
+    RenderLayerModelObject* secondRenderer = toRenderLayerModelObject(document().body()->firstChild()->firstChild()->renderer());
+    GraphicsContext* context = new GraphicsContext(nullptr);
+
+    ClipRect firstClipRect(IntRect(1, 1, 2, 2));
+    {
+        ClipRecorder clipRecorder(firstRenderer, context, DisplayItem::ClipLayerForeground, firstClipRect);
+        drawRect(context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
+        drawRect(context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
+    }
+
+    const PaintList& firstList = renderView()->viewDisplayList().paintList();
+    EXPECT_EQ((size_t)4, firstList.size());

[chrishtr, 2014/11/13 18:42:46]

This is tedious and hard to read. Add some helper methods to help you declare
the expectation in an array literal and then verify.

+    EXPECT_EQ(DisplayItem::ClipLayerForeground, firstList[0]->type());
+    EXPECT_EQ(firstRenderer, firstList[1]->renderer());
+    EXPECT_EQ(DisplayItem::DrawingPaintPhaseBlockBackground, firstList[1]->type());
+    EXPECT_EQ(secondRenderer, firstList[2]->renderer());
+    EXPECT_EQ(DisplayItem::DrawingPaintPhaseBlockBackground, firstList[2]->type());
+    EXPECT_EQ(DisplayItem::EndClip, firstList[3]->type());
+
+    renderView()->viewDisplayList().invalidate(firstRenderer);
+    drawRect(context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
+    drawRect(context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
+
+    const PaintList& secondList = renderView()->viewDisplayList().paintList();
+    EXPECT_EQ((size_t)2, secondList.size());
+    EXPECT_EQ(DisplayItem::DrawingPaintPhaseBlockBackground, secondList[0]->type());
+    EXPECT_EQ(DisplayItem::DrawingPaintPhaseBlockBackground, secondList[1]->type());
+
+    renderView()->viewDisplayList().invalidate(secondRenderer);
+    drawRect(context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
+    ClipRect secondClipRect(IntRect(1, 1, 2, 2));
+    {
+        ClipRecorder clipRecorder(secondRenderer, context, DisplayItem::ClipLayerForeground, secondClipRect);
+        drawRect(context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
+    }
+
+    const PaintList& thirdList = renderView()->viewDisplayList().paintList();
+    EXPECT_EQ((size_t)4, thirdList.size());
+    EXPECT_EQ(firstRenderer, thirdList[0]->renderer());
+    EXPECT_EQ(DisplayItem::DrawingPaintPhaseBlockBackground, thirdList[0]->type());
+    EXPECT_EQ(DisplayItem::ClipLayerForeground, thirdList[1]->type());
+    EXPECT_EQ(secondRenderer, thirdList[1]->renderer());
+    EXPECT_EQ(secondRenderer, thirdList[2]->renderer());
+    EXPECT_EQ(DisplayItem::DrawingPaintPhaseBlockBackground, thirdList[2]->type());
+    EXPECT_EQ(DisplayItem::EndClip, thirdList[3]->type());
+}
+
 }
 
 }