Revert of PaintChunk::id

third_party/WebKit/Source/platform/graphics/paint/PaintChunker.h

Index: third_party/WebKit/Source/platform/graphics/paint/PaintChunker.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.h b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.h
index fe3f6d6fe899b4c4fb8f89c823fa582f58bddbc5..2bf85b9efa43d776efda77a30dca9ab932c82260 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.h
@@ -6,7 +6,6 @@
 #define PaintChunker_h
 
 #include "platform/PlatformExport.h"
-#include "platform/graphics/paint/DisplayItem.h"
 #include "platform/graphics/paint/PaintChunk.h"
 #include "platform/graphics/paint/PaintChunkProperties.h"
 #include "wtf/Allocator.h"
@@ -22,15 +21,23 @@
     DISALLOW_NEW();
     WTF_MAKE_NONCOPYABLE(PaintChunker);
 public:
+    enum ItemBehavior {
+        // Can be combined with adjacent items when building chunks.
+        DefaultBehavior = 0,
+
+        // Item requires its own paint chunk.
+        RequiresSeparateChunk,
+    };
+
     PaintChunker();
     ~PaintChunker();
 
     bool isInInitialState() const { return m_chunks.isEmpty() && m_currentProperties == PaintChunkProperties(); }
 
     const PaintChunkProperties& currentPaintChunkProperties() const { return m_currentProperties; }
-    void updateCurrentPaintChunkProperties(const PaintChunk::Id*, const PaintChunkProperties&);
+    void updateCurrentPaintChunkProperties(const PaintChunkProperties&);
 
-    void incrementDisplayItemIndex(const DisplayItem&);
+    void incrementDisplayItemIndex(ItemBehavior);
     void decrementDisplayItemIndex();
 
     void clear();
@@ -40,17 +47,8 @@
     Vector<PaintChunk> releasePaintChunks();
 
 private:
-    enum ItemBehavior {
-        // Can be combined with adjacent items when building chunks.
-        DefaultBehavior = 0,
-
-        // Item requires its own paint chunk.
-        RequiresSeparateChunk,
-    };
-
     Vector<PaintChunk> m_chunks;
     Vector<ItemBehavior> m_chunkBehavior;
-    Optional<PaintChunk::Id> m_currentChunkId;
     PaintChunkProperties m_currentProperties;
 };