Revert of Move ViewDisplayList to GraphicsLayer

Revert of Move ViewDisplayList to GraphicsLayer (patchset #8 id:140001 of https://codereview.chromium.org/702633002/)

Reason for revert:
This causes MultiColumnRenderingTest.SubtreeWithSpannerBeforeSpanner to time out on Android.

BUG=432926
Original issue's description:
> Move ViewDisplayList to GraphicsLayer
> 
> This CL moves ViewDisplayList to GraphicsLayer and renames it to
> DisplayItemList.
> 
> DisplayItemList and the DisplayItems are also moved to platform/graphics
> to resolve layering violation. The recorders stay in core/paint.
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=185263

TBR=chrishtr@chromium.org,leviw@chromium.org,pdr@chromium.org,trchen@chromium.org
NOTREECHECKS=true
NOTRY=true

[Peter Beverloo, 2014-11-13 16:44:34]

Created Revert of Move ViewDisplayList to GraphicsLayer

[commit-bot: I haz the power, 2014-11-13 16:45:09]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/724003003/1

[commit-bot: I haz the power, 2014-11-13 16:45:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-13 16:45:32]

Failed to apply patch for LayoutTests/TestExpectations:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file LayoutTests/TestExpectations
  Hunk #1 FAILED at 25.
  1 out of 1 hunk FAILED -- saving rejects to file
LayoutTests/TestExpectations.rej

Patch:       LayoutTests/TestExpectations
Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index
85c8e1388e777030db0056ab8b0d9d7caf4473fa..9c80053eadd03e143c57e3f40b17bd006376127f
100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -25,11 +25,6 @@
 crbug.com/437743 [ Mac ]
virtual/slimmingpaint/fast/block/float/float-avoidance.html [ ImageOnlyFailure ]
 crbug.com/437743 [ Mac ]
virtual/slimmingpaint/fast/block/positioning/inline-block-relposition.html [
ImageOnlyFailure ]
 crbug.com/437743 [ Mac ]
virtual/slimmingpaint/fast/block/margin-collapse/103.html [ ImageOnlyFailure ]
-
-crbug.com/432713 [ Debug ] virtual/slimmingpaint/fast/block/float/021.html [
ImageOnlyFailure ]
-crbug.com/432713 [ Debug ]
virtual/slimmingpaint/fast/block/positioning/relative-overflow-block.html [
ImageOnlyFailure ]
-crbug.com/432713 [ Debug ]
virtual/slimmingpaint/fast/block/positioning/relative-overflow-replaced-float.html
[ ImageOnlyFailure ]
-crbug.com/432713 [ Debug ]
virtual/slimmingpaint/fast/block/positioning/relative-overflow-replaced.html [
ImageOnlyFailure ]
 
 # Text::inDocument() returns false but should not.
 crbug.com/264138 dom/xhtml/level3/core/nodecomparedocumentposition38.xhtml [
Failure ]

[Peter Beverloo, 2014-11-13 16:48:32]

The CQ bit was checked by peter@chromium.org

[commit-bot: I haz the power, 2014-11-13 16:49:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/724003003/290001

[commit-bot: I haz the power, 2014-11-13 16:49:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-13 16:49:24]

Failed to apply patch for Source/core/paint/ViewDisplayList.h:
File exist but was about to be overwriten
Patch:   NR 
Source/platform/graphics/paint/DisplayItem.h->Source/core/paint/ViewDisplayList.h
Index: Source/core/paint/ViewDisplayList.h
diff --git a/Source/platform/graphics/paint/DisplayItem.h
b/Source/core/paint/ViewDisplayList.h
similarity index 60%
rename from Source/platform/graphics/paint/DisplayItem.h
rename to Source/core/paint/ViewDisplayList.h
index
f47dda81fe99a6ce1fa5e46d63d873a7da9de11d..4002c81f0f4188a2b8e0304d30fd5ed366b1f56c
100644
--- a/Source/platform/graphics/paint/DisplayItem.h
+++ b/Source/core/paint/ViewDisplayList.h
@@ -2,22 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DisplayItem_h
-#define DisplayItem_h
+#ifndef ViewDisplayList_h
+#define ViewDisplayList_h
 
-#include "platform/PlatformExport.h"
-
-#ifndef NDEBUG
-#include "wtf/text/WTFString.h"
-#endif
+#include "core/rendering/PaintPhase.h"
+#include "wtf/HashSet.h"
+#include "wtf/PassOwnPtr.h"
+#include "wtf/Vector.h"
 
 namespace blink {
 
 class GraphicsContext;
+class RenderObject;
 
-typedef void* DisplayItemClient;
-
-class PLATFORM_EXPORT DisplayItem {
+class DisplayItem {
 public:
     enum Type {
         // DisplayItem types must be kept in sync with PaintPhase.
@@ -55,39 +53,58 @@ public:
 
     virtual void replay(GraphicsContext*) = 0;
 
-    DisplayItemClient client() const { return m_id.client; }
+    const RenderObject* renderer() const { return m_id.renderer; }
     Type type() const { return m_id.type; }
-    bool idsEqual(const DisplayItem& other) const { return m_id.client ==
other.m_id.client && m_id.type == other.m_id.type; }
+    bool idsEqual(const DisplayItem& other) const { return m_id.renderer ==
other.m_id.renderer && m_id.type == other.m_id.type; }
 
 #ifndef NDEBUG
     static WTF::String typeAsDebugString(DisplayItem::Type);
-
-    void setClientDebugString(const WTF::String& clientDebugString) {
m_clientDebugString = clientDebugString; }
-    const WTF::String& clientDebugString() const { return m_clientDebugString;
}
-
+    static WTF::String rendererDebugString(const RenderObject*);
     virtual WTF::String asDebugString() const;
 #endif
 
 protected:
-    DisplayItem(DisplayItemClient client, Type type)
-        : m_id(client, type)
+    DisplayItem(const RenderObject* renderer, Type type)
+        : m_id(renderer, type)
     { }
 
 private:
     struct Id {
-        Id(DisplayItemClient c, Type t)
-            : client(c)
+        Id(const RenderObject* r, Type t)
+            : renderer(r)
             , type(t)
         { }
 
-        const DisplayItemClient client;
+        const RenderObject* renderer;
         const Type type;
     } m_id;
+};
+
+typedef Vector<OwnPtr<DisplayItem> > PaintList;
+
+class ViewDisplayList {
+public:
+    ViewDisplayList() { };
+
+    const PaintList& paintList();
+    void add(WTF::PassOwnPtr<DisplayItem>);
+    void invalidate(const RenderObject*);
+
 #ifndef NDEBUG
-    WTF::String m_clientDebugString;
+    void showDebugData() const;
 #endif
+
+private:
+    PaintList::iterator findDisplayItem(PaintList::iterator, const
DisplayItem&);
+    bool wasInvalidated(const DisplayItem&) const;
+    void updatePaintList();
+
+    PaintList m_paintList;
+    HashSet<const RenderObject*> m_paintListRenderers;
+    HashSet<const RenderObject*> m_invalidated;
+    PaintList m_newPaints;
 };
 
-}
+} // namespace blink
 
-#endif // DisplayItem_h
+#endif // ViewDisplayList_h

[Peter Beverloo, 2014-11-13 16:56:47]

senorblanco@ beat me to it. Abandoning.