Revert "Move ViewDisplayList to GraphicsLayer"

Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/GraphicsLayer.h"
 
 #include "SkImageFilter.h"
 #include "SkMatrix44.h"
-#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
-#include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayerFactory.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
-#include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimation.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFilterOperations.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebGraphicsLayerDebugInfo.h"
@@ skipping 216 matching lines @@
 }
 
 void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)
 {
     if (!m_client)
         return;
     if (firstPaintInvalidationTrackingEnabled())
         m_debugInfo.clearAnnotatedInvalidateRects();
     incrementPaintCount();
     m_client->paintContents(this, context, m_paintingPhase, clip);
-
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-
-#ifndef NDEBUG
-        context.fillRect(clip, Color(0xFF, 0, 0));
-#endif
-        // FIXME: This is incorrect for squashed layers.
-        // We should do proper translation in CompositedLayerMapping once transform paint item is implemented.
-        context.translate(-m_offsetFromRenderer.width(), -m_offsetFromRenderer.height());
-        const PaintList& paintList = displayItemList().paintList();
-        for (PaintList::const_iterator it = paintList.begin(); it != paintList.end(); ++it)
-            (*it)->replay(&context);
-        context.translate(m_offsetFromRenderer.width(), m_offsetFromRenderer.height());
-    }
 }
 
 void GraphicsLayer::updateChildList()
 {
     WebLayer* childHost = m_layer->layer();
     childHost->removeAllChildren();
 
     clearContentsLayerIfUnregistered();
 
     if (m_contentsLayer) {
@@ skipping 764 matching lines @@
 
 void GraphicsLayer::didScroll()
 {
     if (m_scrollableArea) {
         DoublePoint newPosition = m_scrollableArea->minimumScrollPosition() + toDoubleSize(m_layer->layer()->scrollPositionDouble());
         // FIXME: Remove the toFloatPoint(). crbug.com/414283.
         m_scrollableArea->scrollToOffsetWithoutAnimation(toFloatPoint(newPosition));
     }
 }
 
-DisplayItemList& GraphicsLayer::displayItemList()
-{
-    ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
-    if (!m_displayItemList)
-        m_displayItemList = adoptPtr(new DisplayItemList());
-    return *m_displayItemList;
-}
-
 } // namespace blink
 
 #ifndef NDEBUG
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif