Revert of Enable fast/images with slimming paint

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/paint/LayerClipRecorder.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/RenderingTestHelper.h"
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "platform/graphics/GraphicsContext.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 namespace {
 
 class ViewDisplayListTest : public RenderingTest {
@@ skipping 37 matching lines @@
 {
     DrawingRecorder drawingRecorder(context, renderer, phase, bound);
     IntRect rect(0, 0, 10, 10);
     context->drawRect(rect);
 }
 
 void drawClippedRect(GraphicsContext* context, RenderLayerModelObject* renderer, PaintPhase phase, const FloatRect& bound)
 {
     IntRect rect(1, 1, 9, 9);
     ClipRect clipRect(rect);
-    LayerClipRecorder layerClipRecorder(renderer, context, DisplayItem::ClipLayerForeground, clipRect, 0, LayoutPoint(), PaintLayerFlags());
+    ClipRecorder clipRecorder(renderer, context, DisplayItem::ClipLayerForeground, clipRect, 0, LayoutPoint(), PaintLayerFlags());
     drawRect(context, renderer, phase, bound);
 }
 
 TEST_F(ViewDisplayListTest, ViewDisplayListTest_NestedRecorders)
 {
     GraphicsContext* context = new GraphicsContext(nullptr);
     FloatRect bound = renderView()->viewRect();
 
     drawClippedRect(context, renderView(), PaintPhaseForeground, bound);
 
@@ skipping 277 matching lines @@
 
 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));
     {
-        LayerClipRecorder layerClipRecorder(firstRenderer, context, DisplayItem::ClipLayerForeground, firstClipRect, 0, LayoutPoint(), PaintLayerFlags());
+        ClipRecorder clipRecorder(firstRenderer, context, DisplayItem::ClipLayerForeground, firstClipRect, 0, LayoutPoint(), PaintLayerFlags());
         drawRect(context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
         drawRect(context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     }
 
     EXPECT_DISPLAY_LIST(renderView()->viewDisplayList().paintList(), 4,
         TestDisplayItem(firstRenderer, DisplayItem::ClipLayerForeground),
         TestDisplayItem(firstRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(secondRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(firstRenderer, DisplayItem::EndClip));
 
     renderView()->viewDisplayList().invalidate(firstRenderer);
     drawRect(context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     drawRect(context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
 
     EXPECT_DISPLAY_LIST(renderView()->viewDisplayList().paintList(), 2,
         TestDisplayItem(firstRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(secondRenderer, DisplayItem::DrawingPaintPhaseBlockBackground));
 
     renderView()->viewDisplayList().invalidate(secondRenderer);
     drawRect(context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     ClipRect secondClipRect(IntRect(1, 1, 2, 2));
     {
-        LayerClipRecorder layerClipRecorder(secondRenderer, context, DisplayItem::ClipLayerForeground, secondClipRect, 0, LayoutPoint(), PaintLayerFlags());
+        ClipRecorder clipRecorder(secondRenderer, context, DisplayItem::ClipLayerForeground, secondClipRect, 0, LayoutPoint(), PaintLayerFlags());
         drawRect(context, secondRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     }
 
     EXPECT_DISPLAY_LIST(renderView()->viewDisplayList().paintList(), 4,
         TestDisplayItem(firstRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(secondRenderer, DisplayItem::ClipLayerForeground),
         TestDisplayItem(secondRenderer, DisplayItem::DrawingPaintPhaseBlockBackground),
         TestDisplayItem(secondRenderer, DisplayItem::EndClip));
 }
 
 } // anonymous namespace
 } // namespace blink