Ignore scroll node when checking whether a chunk can merge.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
index a039525bffef4319117a8bb9f6337720445c576a..db0620e907bc8e5c2e23153dfc310fd781dfdd52 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
@@ -742,27 +742,17 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedScrollNodes) {
 
   const cc::ScrollTree& scrollTree = propertyTrees().scroll_tree;
   // Node #0 reserved for null; #1 for root render surface.
-  ASSERT_EQ(4u, scrollTree.size());
+  ASSERT_EQ(3u, scrollTree.size());
   const cc::ScrollNode& scrollNodeA = *scrollTree.Node(2);
   EXPECT_EQ(gfx::Size(2, 3), scrollNodeA.scroll_clip_layer_bounds);
   EXPECT_EQ(gfx::Size(5, 7), scrollNodeA.bounds);
   EXPECT_FALSE(scrollNodeA.user_scrollable_horizontal);
   EXPECT_TRUE(scrollNodeA.user_scrollable_vertical);
   EXPECT_EQ(1, scrollNodeA.parent_id);
-  const cc::ScrollNode& scrollNodeB = *scrollTree.Node(3);
-  EXPECT_EQ(gfx::Size(19, 23), scrollNodeB.scroll_clip_layer_bounds);
-  EXPECT_EQ(gfx::Size(29, 31), scrollNodeB.bounds);
-  EXPECT_TRUE(scrollNodeB.user_scrollable_horizontal);
-  EXPECT_FALSE(scrollNodeB.user_scrollable_vertical);
-  EXPECT_EQ(scrollNodeA.id, scrollNodeB.parent_id);
   EXPECT_EQ(expectedCompositorElementIdA, scrollNodeA.element_id);
   EXPECT_EQ(scrollNodeA.id,
             elementIdToScrollNodeIndex(expectedCompositorElementIdA));
-  EXPECT_EQ(expectedCompositorElementIdB, scrollNodeB.element_id);
-  EXPECT_EQ(scrollNodeB.id,
-            elementIdToScrollNodeIndex(expectedCompositorElementIdB));
   EXPECT_EQ(expectedCompositorElementIdA, contentLayerAt(0)->element_id());
-  EXPECT_EQ(expectedCompositorElementIdB, contentLayerAt(1)->element_id());
 
   const cc::TransformTree& transformTree = propertyTrees().transform_tree;
   const cc::TransformNode& transformNodeA =
@@ -770,14 +760,8 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedScrollNodes) {
   EXPECT_TRUE(transformNodeA.local.IsIdentity());
   EXPECT_EQ(gfx::ScrollOffset(-11, -13), transformNodeA.scroll_offset);
 
-  const cc::TransformNode& transformNodeB =
-      *transformTree.Node(scrollNodeB.transform_id);
-  EXPECT_EQ(gfx::ScrollOffset(-37, -41), transformNodeB.scroll_offset);
-
   EXPECT_TRUE(scrollNodeA.main_thread_scrolling_reasons &
               MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
-  EXPECT_FALSE(scrollNodeB.main_thread_scrolling_reasons &
-               MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, MergeSimpleChunks) {