Revert "Move ViewDisplayList to GraphicsLayer"

Source/core/rendering/RenderView.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef RenderView_h
 #define RenderView_h
 
 #include "core/frame/FrameView.h"
+#include "core/paint/ViewDisplayList.h"
 #include "core/rendering/LayoutState.h"
 #include "core/rendering/PaintInvalidationState.h"
 #include "core/rendering/RenderBlockFlow.h"
 #include "platform/PODFreeListArena.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
@@ skipping 121 matching lines @@
 
     virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const override;
 
     double layoutViewportWidth() const;
     double layoutViewportHeight() const;
 
     void pushLayoutState(LayoutState&);
     void popLayoutState();
     virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override final;
 
+    ViewDisplayList& viewDisplayList()
+    {
+        ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
+        if (!m_viewDisplayList)
+            m_viewDisplayList = adoptPtr(new ViewDisplayList());
+        return *m_viewDisplayList;
+    }
+
 private:
     virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override;
     virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
     virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
     virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
 
     void layoutContent();
 #if ENABLE(ASSERT)
     void checkLayoutState();
 #endif
@@ skipping 16 matching lines @@
     bool m_pageLogicalHeightChanged;
     LayoutState* m_layoutState;
     OwnPtr<RenderLayerCompositor> m_compositor;
     OwnPtr<FlowThreadController> m_flowThreadController;
     RefPtr<IntervalArena> m_intervalArena;
 
     RawPtrWillBeMember<RenderQuote> m_renderQuoteHead;
     unsigned m_renderCounterCount;
 
     unsigned m_hitTestCount;
+    OwnPtr<ViewDisplayList> m_viewDisplayList;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderView, isRenderView());
 
 // Suspends the LayoutState cached offset and clipRect optimization. Used under transforms
 // that cannot be represented by LayoutState (common in SVG) and when manipulating the render
 // tree during layout in ways that can trigger paint invalidation of a non-child (e.g. when a list item
 // moves its list marker around). Note that even when disabled, LayoutState is still used to
 // store layoutDelta.
 class ForceHorriblySlowRectMapping {
@@ skipping 13 matching lines @@
             m_paintInvalidationState->m_cachedOffsetsEnabled = true;
     }
 private:
     const PaintInvalidationState* m_paintInvalidationState;
     bool m_didDisable;
 };
 
 } // namespace blink
 
 #endif // RenderView_h