Clean up linux_layout_tests_layout_ng_disabled failures.

New tests that don't pass in legacy layout, and missing bot-specific
rebaselines [1].

The bot isn't triggered nearly as often as it should, so failures are
inadvertently introduced.

[1] CL:1883620, CL:1898439, CL:1928310

TBR=ikilpatrick@chromium.org, mtklein@google.com, vmpstr@chromium.org, wangxianzhu@chromium.org

Change-Id: I2944cc5e90ae8c445f1d99dc6010149a4da8a9cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1930696
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718103}

third_party/blink/web_tests/FlagExpectations/disable-layout-ng

@@ -82,6 +82,9 @@ crbug.com/591099 external/wpt/css/css-text/hyphens/hyphens-shaping-001.html [ Fa
 
 ### external/wpt/css/css-text/line-break/
 crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-001.html [ Failure ]
+crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-and-white-space-004.html [ Failure ]
+crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-and-white-space-006.html [ Failure ]
+crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-and-white-space-007.html [ Failure ]
 crbug.com/591099 external/wpt/css/css-text/line-break/line-break-shaping-001.html [ Failure ]
 
 ### external/wpt/css/css-text/line-breaking/
@@ -378,6 +381,7 @@ crbug.com/1016759 paint/invalidation/svg/animated-path-inside-transformed-html.x
 crbug.com/1016759 paint/invalidation/svg/circle-move-invalidation.svg [ Failure ]
 
 # display-locking
+crbug.com/591099 wpt_internal/display-lock/css-render-subtree/invisible-size-contained.html [ Failure ]
 crbug.com/1007506 wpt_internal/display-lock/rendersubtree/sizing/overflow-auto-with-overflow.html [ Failure ]
 
 # 10/02/2019 Mark tests as failing. Mostly shapes, slight image differences

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -22,6 +22,12 @@
           "reason": "chunk appeared"
         }
       ]
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-hide-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -17,6 +17,12 @@
           "reason": "style change"
         }
       ]
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-show-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -17,6 +17,12 @@
           "reason": "style change"
         }
       ]
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-change-containing-block-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -17,6 +17,12 @@
           "reason": "chunk appeared"
         }
       ]
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-moved-expected.txt

@@ -2,30 +2,39 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='fixed red'",
-          "rect": [108, 1100, 100, 100],
-          "reason": "chunk disappeared"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'",
+          "object": "LayoutBlockFlow HTML",
           "rect": [100, 100, 100, 100],
           "reason": "chunk appeared"
+        }
+      ]
     },
     {
-          "object": "LayoutBlockFlow (positioned) DIV class='fixed red'",
-          "rect": [8, 1000, 100, 100],
-          "reason": "chunk appeared"
+      "name": "LayoutBlockFlow (positioned) DIV class='fixed red'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 1
     },
     {
-          "object": "LayoutBlockFlow (positioned) DIV class='fixed red'",
-          "rect": [8, 1000, 100, 100],
-          "reason": "chunk disappeared"
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [8, 1000, 0, 1]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-scale-expected.txt

@@ -2,22 +2,23 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
+      "transform": 1
+    },
     {
-          "object": "LayoutBlockFlow (positioned) DIV id='t' class='green translated'",
-          "rect": [100, 300, 100, 100],
-          "reason": "paint property change"
+      "name": "LayoutBlockFlow (positioned) DIV id='t' class='green translated'",
+      "bounds": [50, 50],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 3
     },
     {
-          "object": "LayoutBlockFlow (positioned) DIV id='t' class='green translated'",
-          "rect": [125, 325, 50, 50],
-          "reason": "paint property change"
-        }
-      ],
-      "transform": 1
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +30,26 @@
         [0, 0, 1, 0],
         [0, -200, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [125, 125, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 2,
+      "transform": [
+        [2, 0, 0, 0],
+        [0, 2, 0, 0],
+        [0, 0, 1, 0],
+        [0, 0, 0, 1]
+      ],
+      "origin": [25, 25]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -10,18 +10,14 @@
           "object": "LayoutBlockFlow HTML",
           "rect": [8, 208, 200, 200],
           "reason": "chunk appeared"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
-          "rect": [108, 300, 100, 100],
-          "reason": "chunk disappeared"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
-          "rect": [8, 200, 100, 100],
-          "reason": "chunk disappeared"
         }
       ]
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -18,6 +18,12 @@
         }
       ],
       "transform": 1
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt

@@ -2,22 +2,33 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "bounds": [100, 100],
       "paintInvalidations": [
         {
           "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'",
-          "rect": [250, 280, 100, 100],
+          "rect": [0, 0, 100, 100],
           "reason": "paint property change"
         },
         {
           "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [250, 280, 100, 100],
-          "reason": "paint property change"
+          "rect": [0, 0, 100, 100],
+          "reason": "chunk disappeared"
         }
       ],
-      "transform": 1
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +40,15 @@
         [0, 0, 1, 0],
         [0, -180, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [250, 100, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt

@@ -2,17 +2,29 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='reflected fixed'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
       "paintInvalidations": [
         {
           "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'",
-          "rect": [250, 280, 100, 100],
+          "rect": [0, 0, 100, 100],
           "reason": "chunk reordered"
         }
       ],
-      "transform": 1
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -24,6 +36,15 @@
         [0, 0, 1, 0],
         [0, -180, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [250, 100, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-after-scroll-expected.txt

@@ -2,22 +2,44 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV id='t' class='green absolute'",
-          "rect": [8, 700, 100, 100],
-          "reason": "paint property change"
+          "object": "LayoutBlockFlow HTML",
+          "rect": [8, 200, 100, 100],
+          "reason": "chunk disappeared"
+        }
+      ],
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='red fixed'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
     },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV id='t' class='green absolute'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
         {
           "object": "LayoutBlockFlow (positioned) DIV id='t' class='green absolute'",
-          "rect": [8, 200, 100, 100],
-          "reason": "paint property change"
+          "rect": [0, 0, 100, 100],
+          "reason": "full layer"
         }
       ],
-      "transform": 1
+      "transform": 3
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +51,24 @@
         [0, 0, 1, 0],
         [0, -500, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [8, 200, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [8, 200, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt

@@ -2,17 +2,37 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='fixed red'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#FF0000",
+      "transform": 2
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
       "paintInvalidations": [
         {
           "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'",
-          "rect": [100, 700, 100, 100],
-          "reason": "chunk appeared"
+          "rect": [0, 0, 100, 100],
+          "reason": "full layer"
         }
       ],
-      "transform": 1
+      "transform": 3
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -24,6 +44,25 @@
         [0, 0, 1, 0],
         [0, -500, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [100, 200, 0, 1]
+      ]
+    },
+    {
+      "id": 3,
+      "parent": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [100, 700, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-simple-expected.txt

@@ -2,22 +2,23 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
+      "transform": 1
+    },
     {
-          "object": "LayoutBlockFlow (positioned) DIV class='green'",
-          "rect": [8, 200, 100, 100],
-          "reason": "paint property change"
+      "name": "LayoutBlockFlow (positioned) DIV class='green'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "transform": 2
     },
     {
-          "object": "LayoutBlockFlow (positioned) DIV class='green'",
-          "rect": [8, 100, 100, 100],
-          "reason": "paint property change"
-        }
-      ],
-      "transform": 1
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +30,15 @@
         [0, 0, 1, 0],
         [0, -100, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [8, 100, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt

+{
+  "layers": [
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "backgroundColor": "#FFFFFF",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='fixed green'",
+          "rect": [8, 200, 100, 100],
+          "reason": "paint property change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='fixed green'",
+          "rect": [8, 100, 100, 100],
+          "reason": "paint property change"
+        }
+      ],
+      "transform": 1
+    }
+  ],
+  "transforms": [
+    {
+      "id": 1,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [0, -100, 0, 1]
+      ]
+    }
+  ]
+}
+

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt

@@ -2,17 +2,40 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [100, 1150, 100, 100],
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+          "rect": [0, 0, 100, 100],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutBlockFlow HTML",
+          "rect": [0, 0, 100, 100],
           "reason": "chunk appeared"
         }
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "bounds": [100, 100],
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full layer"
+        }
+      ],
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -24,6 +47,15 @@
         [0, 0, 1, 0],
         [0, -1000, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [100, 150, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -16,18 +16,6 @@
           "rect": [93, 234, 142, 143],
           "reason": "chunk disappeared"
         }
-      ],
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, -180, 0, 1]
       ]
     }
   ]

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -17,6 +17,12 @@
           "reason": "chunk appeared"
         }
       ]
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt

@@ -2,22 +2,33 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
+      "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "bounds": [100, 100],
       "paintInvalidations": [
         {
           "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [100, 1150, 100, 100],
+          "rect": [0, 0, 100, 100],
           "reason": "chunk appeared"
         },
         {
           "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [100, 1150, 100, 100],
+          "rect": [0, 0, 100, 100],
           "reason": "chunk disappeared"
         }
       ],
-      "transform": 1
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +40,15 @@
         [0, 0, 1, 0],
         [0, -1000, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [100, 150, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-cell-expected.txt

@@ -2,7 +2,7 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -10,14 +10,29 @@
           "object": "LayoutTableCell TD id='moveMe'",
           "rect": [200, 200, 100, 100],
           "reason": "disappeared"
+        }
+      ],
+      "transform": 1
     },
+    {
+      "name": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
         {
           "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
-          "rect": [50, 200, 100, 100],
-          "reason": "chunk appeared"
+          "rect": [0, 0, 100, 100],
+          "reason": "full layer"
         }
       ],
-      "transform": 1
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +44,15 @@
         [0, 0, 1, 0],
         [0, -100, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [50, 100, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-expected.txt

@@ -2,25 +2,15 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
-          "rect": [100, 100, 100, 100],
-          "reason": "chunk appeared"
-        },
         {
           "object": "LayoutTableCell TD id='moveMe'",
           "rect": [100, 100, 100, 100],
           "reason": "disappeared"
         },
-        {
-          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
-          "rect": [0, 100, 100, 100],
-          "reason": "chunk appeared"
-        },
         {
           "object": "LayoutBlockFlow (relative positioned) DIV class='green'",
           "rect": [0, 100, 100, 100],
@@ -28,6 +18,26 @@
         }
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "position": [-100, 0],
+      "bounds": [200, 100],
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+          "rect": [0, 0, 200, 100],
+          "reason": "full layer"
+        }
+      ],
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -39,6 +49,15 @@
         [0, 0, 1, 0],
         [0, -100, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [100, 0, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt

@@ -2,15 +2,10 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 2016],
+      "bounds": [785, 2016],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
-          "rect": [100, 100, 100, 100],
-          "reason": "chunk appeared"
-        },
         {
           "object": "LayoutTableCell TD id='moveMe'",
           "rect": [0, 100, 100, 100],
@@ -18,6 +13,26 @@
         }
       ],
       "transform": 1
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "bounds": [100, 100],
+      "contentsOpaque": true,
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full layer"
+        }
+      ],
+      "transform": 2
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 600],
+      "contentsOpaque": true
     }
   ],
   "transforms": [
@@ -29,6 +44,15 @@
         [0, 0, 1, 0],
         [0, -100, 0, 1]
       ]
+    },
+    {
+      "id": 2,
+      "transform": [
+        [1, 0, 0, 0],
+        [0, 1, 0, 0],
+        [0, 0, 1, 0],
+        [100, 0, 0, 1]
+      ]
     }
   ]
 }

third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt

@@ -18,6 +18,23 @@
         }
       ],
       "transform": 1
+    },
+    {
+      "name": "ContentsLayer for Horizontal Scrollbar Layer",
+      "position": [0, 585],
+      "bounds": [785, 15],
+      "contentsOpaque": true
+    },
+    {
+      "name": "ContentsLayer for Vertical Scrollbar Layer",
+      "position": [785, 0],
+      "bounds": [15, 585],
+      "contentsOpaque": true
+    },
+    {
+      "name": "Scroll Corner Layer",
+      "position": [785, 585],
+      "bounds": [15, 15]
     }
   ],
   "transforms": [
@@ -27,7 +44,7 @@
         [1, 0, 0, 0],
         [0, 1, 0, 0],
         [0, 0, 1, 0],
-        [-766, -1181, 0, 1]
+        [-781, -1196, 0, 1]
       ]
     }
   ]