Rebaseline for crrev.com/c/2370716

TBR=sclittle@chromium.org

Change-Id: Id2b2f00c4f293b10fdfb24b2267fc4642545ffe7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380814Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802464}

third_party/blink/web_tests/platform/mac/compositing/layer-creation/scroll-partial-update-expected.txt

@@ -24,17 +24,17 @@ scroll me
       "bounds": [200, 200],
       "transform": 2
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [185, 400],
-      "backgroundColor": "#FFFF0080",
-      "transform": 3
-    },
     {
       "name": "ContentsLayer for Vertical Scrollbar Layer",
       "position": [185, 0],
       "bounds": [15, 200],
       "transform": 2
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [185, 400],
+      "backgroundColor": "#FFFF0080",
+      "transform": 3
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/compositing/overflow/overflow-auto-with-touch-expected.txt

@@ -11,12 +11,6 @@
       "bounds": [300, 300],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1000, 1000],
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 285],
@@ -34,6 +28,12 @@
       "position": [285, 285],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [1000, 1000],
+      "backgroundColor": "#C0C0C0",
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt

@@ -11,12 +11,6 @@
       "bounds": [300, 300],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1000, 1000],
-      "backgroundColor": "#C0C0C0",
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 285],
@@ -34,6 +28,12 @@
       "position": [285, 285],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [1000, 1000],
+      "backgroundColor": "#C0C0C0",
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt

@@ -11,14 +11,6 @@
       "bounds": [600, 200],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [585, 500],
-      "invalidations": [
-        [400, 100, 20, 20]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 185],
@@ -36,6 +28,14 @@
       "position": [585, 185],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [585, 500],
+      "invalidations": [
+        [400, 100, 20, 20]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt

@@ -11,15 +11,6 @@
       "bounds": [600, 200],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [585, 400],
-      "invalidations": [
-        [400, 0, 50, 50],
-        [0, 0, 50, 50]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 185],
@@ -37,6 +28,15 @@
       "position": [585, 185],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [585, 400],
+      "invalidations": [
+        [400, 0, 50, 50],
+        [0, 0, 50, 50]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-color-change-expected.txt

@@ -11,14 +11,6 @@
       "bounds": [200, 200],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [185, 615],
-      "invalidations": [
-        [0, 0, 47, 615]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 185],
@@ -36,6 +28,14 @@
       "position": [185, 185],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [185, 615],
+      "invalidations": [
+        [0, 0, 47, 615]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.txt

@@ -14,20 +14,6 @@
       "bounds": [800, 500],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [785, 1340],
-      "invalidations": [
-        [10, 72, 227, 18],
-        [20, 160, 200, 72],
-        [10, 126, 139, 12],
-        [268, 0, 46, 18],
-        [90, 0, 46, 18],
-        [224, 0, 45, 18],
-        [52, 18, 45, 18]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 485],
@@ -45,6 +31,20 @@
       "position": [785, 485],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [785, 1340],
+      "invalidations": [
+        [10, 72, 227, 18],
+        [20, 160, 200, 72],
+        [10, 126, 139, 12],
+        [268, 0, 46, 18],
+        [90, 0, 46, 18],
+        [224, 0, 45, 18],
+        [52, 18, 45, 18]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt

@@ -11,6 +11,24 @@
       "bounds": [200, 200],
       "transform": 1
     },
+    {
+      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "position": [0, 185],
+      "bounds": [185, 15],
+      "transform": 1
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [185, 0],
+      "bounds": [15, 185],
+      "transform": 1
+    },
+    {
+      "name": "Scroll Corner Layer",
+      "position": [185, 185],
+      "bounds": [15, 15],
+      "transform": 1
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [185, 234],
@@ -30,24 +48,6 @@
         [0, 0, 75, 18]
       ],
       "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Horizontal Scrollbar Layer",
-      "position": [0, 185],
-      "bounds": [185, 15],
-      "transform": 1
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [185, 0],
-      "bounds": [15, 185],
-      "transform": 1
-    },
-    {
-      "name": "Scroll Corner Layer",
-      "position": [185, 185],
-      "bounds": [15, 15],
-      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/updating-scrolling-container-expected.txt

@@ -14,12 +14,6 @@
       ],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [5, 5],
-      "bounds": [400, 400],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [5, 190],
@@ -37,6 +31,12 @@
       "position": [190, 190],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [5, 5],
+      "bounds": [400, 400],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/flexbox/scrollbars-changed-expected.txt

@@ -10,6 +10,11 @@
       "name": "LayoutNGBlockFlow DIV id='scroller'",
       "bounds": [200, 100]
     },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [185, 0],
+      "bounds": [15, 100]
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [185, 210],
@@ -17,11 +22,6 @@
       "invalidations": [
         [0, 5, 15, 15]
       ]
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [185, 0],
-      "bounds": [15, 100]
     }
   ]
 }

third_party/blink/web_tests/platform/mac/paint/invalidation/float-offscreen-expected.txt

@@ -11,11 +11,6 @@
       "bounds": [784, 300],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [784, 1027],
-      "transform": 1
-    },
     {
       "name": "Horizontal Scrollbar Layer",
       "position": [0, 300],
@@ -27,6 +22,11 @@
       "position": [784, 0],
       "bounds": [0, 300],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [784, 1027],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/forms/textarea-caret-expected.txt

@@ -19,16 +19,6 @@
       ],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [1, 1],
-      "bounds": [470, 19],
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [0, 0, 470, 19]
-      ],
-      "transform": 2
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [1, 20],
@@ -44,6 +34,16 @@
       ],
       "transform": 1
     },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [1, 1],
+      "bounds": [470, 19],
+      "backgroundColor": "#FFFFFF",
+      "invalidations": [
+        [0, 0, 470, 19]
+      ],
+      "transform": 2
+    },
     {
       "name": "Decoration Layer",
       "position": [-2, -2],

third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/vertical-overflow-child-expected.txt

@@ -11,15 +11,6 @@
       "bounds": [302, 202],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [1, 1],
-      "bounds": [2100, 185],
-      "invalidations": [
-        [2000, 0, 100, 100]
-      ],
-      "transform": 2
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [1, 186],
@@ -37,6 +28,15 @@
       "position": [286, 186],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [1, 1],
+      "bounds": [2100, 185],
+      "invalidations": [
+        [2000, 0, 100, 100]
+      ],
+      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/vertical-overflow-parent-expected.txt

@@ -11,15 +11,6 @@
       "bounds": [302, 202],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [1, 1],
-      "bounds": [2100, 185],
-      "invalidations": [
-        [0, 0, 100, 100]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [1, 186],
@@ -37,6 +28,15 @@
       "position": [286, 186],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [1, 1],
+      "bounds": [2100, 185],
+      "invalidations": [
+        [0, 0, 100, 100]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/vertical-overflow-same-expected.txt

@@ -11,15 +11,6 @@
       "bounds": [302, 202],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [1, 1],
-      "bounds": [2100, 185],
-      "invalidations": [
-        [0, 0, 100, 100]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [1, 186],
@@ -37,6 +28,15 @@
       "position": [286, 186],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [1, 1],
+      "bounds": [2100, 185],
+      "invalidations": [
+        [0, 0, 100, 100]
+      ],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt

@@ -11,14 +11,6 @@
       "bounds": [300, 300],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1000, 1000],
-      "invalidations": [
-        [100, 150, 100, 100]
-      ],
-      "transform": 2
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 285],
@@ -36,6 +28,14 @@
       "position": [285, 285],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [1000, 1000],
+      "invalidations": [
+        [100, 150, 100, 100]
+      ],
+      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt

@@ -11,14 +11,6 @@
       "bounds": [300, 300],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [1050, 1050],
-      "invalidations": [
-        [100, 150, 100, 100]
-      ],
-      "transform": 2
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 285],
@@ -36,6 +28,14 @@
       "position": [285, 285],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [1050, 1050],
+      "invalidations": [
+        [100, 150, 100, 100]
+      ],
+      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt

@@ -14,15 +14,6 @@
       "bounds": [130, 130],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [10, 10],
-      "bounds": [150, 150],
-      "invalidations": [
-        [0, 0, 75, 75]
-      ],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [10, 105],
@@ -41,18 +32,18 @@
       "bounds": [15, 15],
       "transform": 1
     },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [130, 130],
-      "transform": 2
-    },
     {
       "name": "Scrolling Contents Layer",
       "position": [10, 10],
-      "bounds": [95, 150],
+      "bounds": [150, 150],
       "invalidations": [
-        [20, 0, 75, 75]
+        [0, 0, 75, 75]
       ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "bounds": [130, 130],
       "transform": 2
     },
     {
@@ -73,18 +64,18 @@
       "bounds": [15, 15],
       "transform": 2
     },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [130, 130],
-      "transform": 3
-    },
     {
       "name": "Scrolling Contents Layer",
       "position": [10, 10],
-      "bounds": [150, 150],
+      "bounds": [95, 150],
       "invalidations": [
-        [0, 0, 75, 75]
+        [20, 0, 75, 75]
       ],
+      "transform": 2
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "bounds": [130, 130],
       "transform": 3
     },
     {
@@ -105,18 +96,18 @@
       "bounds": [15, 15],
       "transform": 3
     },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [130, 130],
-      "transform": 4
-    },
     {
       "name": "Scrolling Contents Layer",
-      "position": [25, 10],
-      "bounds": [95, 150],
+      "position": [10, 10],
+      "bounds": [150, 150],
       "invalidations": [
-        [20, 0, 75, 75]
+        [0, 0, 75, 75]
       ],
+      "transform": 3
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "bounds": [130, 130],
       "transform": 4
     },
     {
@@ -137,18 +128,18 @@
       "bounds": [15, 15],
       "transform": 4
     },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
-      "bounds": [130, 130],
-      "transform": 5
-    },
     {
       "name": "Scrolling Contents Layer",
-      "position": [10, 10],
-      "bounds": [150, 95],
+      "position": [25, 10],
+      "bounds": [95, 150],
       "invalidations": [
-        [0, 20, 75, 75]
+        [20, 0, 75, 75]
       ],
+      "transform": 4
+    },
+    {
+      "name": "LayoutNGBlockFlow (relative positioned) DIV class='scroll'",
+      "bounds": [130, 130],
       "transform": 5
     },
     {
@@ -168,6 +159,15 @@
       "position": [105, 105],
       "bounds": [15, 15],
       "transform": 5
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [10, 10],
+      "bounds": [150, 95],
+      "invalidations": [
+        [0, 20, 75, 75]
+      ],
+      "transform": 5
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt

@@ -11,6 +11,12 @@
       "bounds": [784, 300],
       "transform": 1
     },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [769, 0],
+      "bounds": [15, 300],
+      "transform": 1
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [769, 700],
@@ -21,11 +27,6 @@
       "bounds": [769, 400],
       "transform": 3
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [754, 800],
-      "transform": 4
-    },
     {
       "name": "ContentsLayer for Vertical Scrollbar Layer",
       "position": [754, 0],
@@ -33,10 +34,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [769, 0],
-      "bounds": [15, 300],
-      "transform": 1
+      "name": "Scrolling Contents Layer",
+      "bounds": [754, 800],
+      "transform": 4
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-delete-expected.txt

@@ -11,6 +11,12 @@
       "bounds": [80, 69],
       "transform": 1
     },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [65, 0],
+      "bounds": [15, 69],
+      "transform": 1
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [65, 198],
@@ -18,12 +24,6 @@
         [0, 162, 44, 36]
       ],
       "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [65, 0],
-      "bounds": [15, 69],
-      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt

@@ -11,6 +11,12 @@
       "bounds": [784, 300],
       "transform": 1
     },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [769, 0],
+      "bounds": [15, 300],
+      "transform": 1
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [769, 700],
@@ -21,11 +27,6 @@
       "bounds": [769, 400],
       "transform": 3
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [754, 800],
-      "transform": 4
-    },
     {
       "name": "ContentsLayer for Vertical Scrollbar Layer",
       "position": [754, 0],
@@ -33,10 +34,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [769, 0],
-      "bounds": [15, 300],
-      "transform": 1
+      "name": "Scrolling Contents Layer",
+      "bounds": [754, 800],
+      "transform": 4
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt

@@ -11,12 +11,6 @@
       "bounds": [300, 300],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [650, 600],
-      "backgroundColor": "#0000FF80",
-      "transform": 2
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 285],
@@ -35,6 +29,12 @@
       "bounds": [15, 15],
       "transform": 1
     },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [650, 600],
+      "backgroundColor": "#0000FF80",
+      "transform": 2
+    },
     {
       "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
       "bounds": [600, 600],

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt

@@ -11,11 +11,6 @@
       "bounds": [100, 200],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [400, 400],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 185],
@@ -33,6 +28,11 @@
       "position": [85, 185],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [400, 400],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt

@@ -15,12 +15,6 @@
       "bounds": [202, 202],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [1, 1],
-      "bounds": [2000, 2000],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [1, 186],
@@ -38,6 +32,12 @@
       "position": [186, 186],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [1, 1],
+      "bounds": [2000, 2000],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scrollbar-parts-expected.txt

@@ -11,11 +11,6 @@
       "bounds": [100, 100],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [150, 300],
-      "transform": 1
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 85],
@@ -33,6 +28,11 @@
       "position": [85, 85],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [150, 300],
+      "transform": 1
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt

@@ -11,17 +11,17 @@
       "bounds": [360, 640],
       "transform": 2
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [345, 2018],
-      "transform": 3
-    },
     {
       "name": "ContentsLayer for Vertical Scrollbar Layer",
       "position": [345, 0],
       "bounds": [15, 640],
       "transform": 2
     },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [345, 2018],
+      "transform": 3
+    },
     {
       "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'",
       "bounds": [345, 18],

third_party/blink/web_tests/platform/mac/paint/invalidation/table/scroll-inside-table-cell-expected.txt

@@ -11,12 +11,6 @@
       "bounds": [454, 469],
       "transform": 1
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [2, 2],
-      "bounds": [950, 450],
-      "transform": 2
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [2, 452],
@@ -34,6 +28,12 @@
       "position": [437, 452],
       "bounds": [15, 15],
       "transform": 1
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [2, 2],
+      "bounds": [950, 450],
+      "transform": 2
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt

@@ -12,12 +12,6 @@
       "bounds": [454, 469],
       "transform": 2
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "position": [2, 2],
-      "bounds": [950, 450],
-      "transform": 3
-    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [2, 452],
@@ -36,6 +30,12 @@
       "bounds": [15, 15],
       "transform": 2
     },
+    {
+      "name": "Scrolling Contents Layer",
+      "position": [2, 2],
+      "bounds": [950, 450],
+      "transform": 3
+    },
     {
       "name": "ContentsLayer for Horizontal Scrollbar Layer",
       "position": [0, 585],

third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt

@@ -11,6 +11,12 @@
       "bounds": [784, 300],
       "transform": 1
     },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [769, 0],
+      "bounds": [15, 300],
+      "transform": 1
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [769, 700],
@@ -21,11 +27,6 @@
       "bounds": [769, 400],
       "transform": 3
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [754, 810],
-      "transform": 4
-    },
     {
       "name": "ContentsLayer for Vertical Scrollbar Layer",
       "position": [754, 0],
@@ -33,10 +34,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [769, 0],
-      "bounds": [15, 300],
-      "transform": 1
+      "name": "Scrolling Contents Layer",
+      "bounds": [754, 810],
+      "transform": 4
     }
   ],
   "transforms": [

third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt

@@ -11,6 +11,12 @@
       "bounds": [784, 300],
       "transform": 1
     },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [769, 0],
+      "bounds": [15, 300],
+      "transform": 1
+    },
     {
       "name": "Scrolling Contents Layer",
       "bounds": [769, 700],
@@ -21,11 +27,6 @@
       "bounds": [769, 400],
       "transform": 3
     },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [754, 810],
-      "transform": 4
-    },
     {
       "name": "ContentsLayer for Vertical Scrollbar Layer",
       "position": [754, 0],
@@ -33,10 +34,9 @@
       "transform": 3
     },
     {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [769, 0],
-      "bounds": [15, 300],
-      "transform": 1
+      "name": "Scrolling Contents Layer",
+      "bounds": [754, 810],
+      "transform": 4
     }
   ],
   "transforms": [