Revert of Remove begin/end subseq. display items, and store on PaintController instead.

third_party/WebKit/Source/platform/graphics/paint/PaintChunkTest.cpp

 // Copyright 2016 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 "platform/graphics/paint/PaintChunk.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/testing/FakeDisplayItemClient.h"
 #include "platform/wtf/Optional.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 18 matching lines @@
   EXPECT_TRUE(PaintChunk(0, 1, &id, properties)
                   .matches(PaintChunk(0, 1, &idEqual, properties)));
   EXPECT_TRUE(PaintChunk(0, 1, &idEqual, properties)
                   .matches(PaintChunk(0, 1, &id, properties)));
 }
 
 TEST(PaintChunkTest, IdNotMatches) {
   PaintChunkProperties properties;
   FakeDisplayItemClient client1;
   client1.updateCacheGeneration();
-  DisplayItem::Id id1(client1, DisplayItem::kDrawingFirst);
+  DisplayItem::Id id1a(client1, DisplayItem::kDrawingFirst);
+  DisplayItem::Id id1b(client1, DisplayItem::kSubsequence);
+  EXPECT_FALSE(PaintChunk(0, 1, &id1a, properties)
+                   .matches(PaintChunk(0, 1, &id1b, properties)));
+  EXPECT_FALSE(PaintChunk(0, 1, &id1b, properties)
+                   .matches(PaintChunk(0, 1, &id1a, properties)));
 
   FakeDisplayItemClient client2;
   client2.updateCacheGeneration();
   DisplayItem::Id id2(client2, DisplayItem::kDrawingFirst);
+  EXPECT_FALSE(PaintChunk(0, 1, &id1a, properties)
+                   .matches(PaintChunk(0, 1, &id2, properties)));
   EXPECT_FALSE(PaintChunk(0, 1, &id2, properties)
-                   .matches(PaintChunk(0, 1, &id1, properties)));
+                   .matches(PaintChunk(0, 1, &id1a, properties)));
 }
 
 TEST(PaintChunkTest, IdNotMatchesNull) {
   PaintChunkProperties properties;
   FakeDisplayItemClient client;
   client.updateCacheGeneration();
   DisplayItem::Id id(client, DisplayItem::kDrawingFirst);
   EXPECT_FALSE(PaintChunk(0, 1, nullptr, properties)
                    .matches(PaintChunk(0, 1, &id, properties)));
   EXPECT_FALSE(PaintChunk(0, 1, &id, properties)
@@ skipping 23 matching lines @@
 
   // Delete the current object and create a new object at the same address.
   client = WTF::nullopt;
   client.emplace();
   EXPECT_TRUE(client->isJustCreated());
   EXPECT_FALSE(PaintChunk(0, 1, &id, properties)
                    .matches(PaintChunk(0, 1, &id, properties)));
 }
 
 }  // namespace blink