Enable PaintNonFastScrollableRegions by default

This patch flips the PaintNonFastScrollableRegions flag to be enabled by
default. For more information about PaintNonFastScrollableRegions, see:
https://docs.google.com/document/d/1IyYJ6bVF7KZq96b_s5NrAzGtVoBXn_LQnya9y4yT3iw/view

The expectation has changed for compositor-touch-hit-rects-global.html
which is now correct and was incorrect due to https://crbug.com/992708.
The underlying bug has not been fixed.

Some expectations have new invalidations because going from scrollable
to non-scrollable (or vice versa) causes a scroll hit test display item
to disappear (or appear). paint/invalidation/resize-iframe-text.html and
paint/invalidation/compositing/iframe-inside-squashed-layer.html are
examples of tests changed due to this.

Some expectations have larger invalidations because the
resizer's scroll hit test display item uses the entire box as the
display item client. destroy-overlay-scrollbar.html and
destroy-scrollbar.html are examples of tests changed due to this.

Bug: 864567
Change-Id: Ia83de472ac2df10df09dd4476449dd6329848d11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1734214Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688631}

third_party/blink/renderer/core/paint/block_painter_test.cc

@@ -449,11 +449,17 @@ TEST_F(BlockPainterTouchActionTest, ScrolledHitTestChunkProperties) {
   EXPECT_THAT(RootPaintController().GetDisplayItemList(),
               ElementsAre(IsSameId(&scrolling_client, kDocumentBackgroundType),
                           IsSameId(scroller, DisplayItem::kHitTest),
+                          IsSameId(scroller, DisplayItem::kScrollHitTest),
                           IsSameId(child, DisplayItem::kHitTest)));
 
-  HitTestData scroller_hit_test_data;
-  scroller_hit_test_data.touch_action_rects.emplace_back(
+  HitTestData scroller_touch_action_hit_test_data;
+  scroller_touch_action_hit_test_data.touch_action_rects.emplace_back(
       LayoutRect(0, 0, 100, 100));
+  const auto& scrolling_contents_properties =
+      scroller->FirstFragment().ContentsProperties();
+  HitTestData scroll_hit_test_data;
+  scroll_hit_test_data.SetScrollHitTest(
+      &scrolling_contents_properties.Transform(), IntRect(0, 0, 100, 100));
   HitTestData scrolled_hit_test_data;
   scrolled_hit_test_data.touch_action_rects.emplace_back(
       LayoutRect(0, 0, 200, 50));
@@ -469,9 +475,13 @@ TEST_F(BlockPainterTouchActionTest, ScrolledHitTestChunkProperties) {
                        PaintChunk::Id(*scroller->Layer(),
                                       kNonScrollingBackgroundChunkType),
                        scroller->FirstFragment().LocalBorderBoxProperties(),
-                       scroller_hit_test_data),
+                       scroller_touch_action_hit_test_data),
+          IsPaintChunk(2, 3,
+                       PaintChunk::Id(*scroller, DisplayItem::kScrollHitTest),
+                       scroller->FirstFragment().LocalBorderBoxProperties(),
+                       scroll_hit_test_data),
           IsPaintChunk(
-              2, 3,
+              3, 4,
               PaintChunk::Id(*scroller, kScrollingContentsBackgroundChunkType),
               scroller->FirstFragment().ContentsProperties(),
               scrolled_hit_test_data)));
@@ -481,7 +491,7 @@ TEST_F(BlockPainterTouchActionTest, ScrolledHitTestChunkProperties) {
   // The hit test rect for the scroller itself should not be scrolled.
   EXPECT_FALSE(scroller_paint_chunk.properties.Transform().ScrollNode());
 
-  const auto& scrolled_paint_chunk = paint_chunks[2];
+  const auto& scrolled_paint_chunk = paint_chunks[3];
   EXPECT_EQ(IntRect(0, 0, 200, 50), scrolled_paint_chunk.bounds);
   // The hit test rect for the scrolled contents should be scrolled.
   EXPECT_TRUE(scrolled_paint_chunk.properties.Transform().ScrollNode());

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1161,7 +1161,7 @@
     // See: https://docs.google.com/document/d/1IyYJ6bVF7KZq96b_s5NrAzGtVoBXn_LQnya9y4yT3iw/view
     {
       name: "PaintNonFastScrollableRegions",
-      implied_by: ["CompositeAfterPaint"],
+      status: "stable",
     },
     {
       name: "PaintUnderInvalidationChecking",

third_party/blink/web_tests/FlagExpectations/disable-blink-features=LayoutNG

@@ -332,3 +332,18 @@ crbug.com/591099 external/wpt/css/css-flexbox/percentage-heights-006.html [ Fail
 # These would need a rebaseline back from LayoutNGBlockFlow to LayoutBlockFlow
 crbug.com/591099 compositing/overflow/scroll-parent-absolute-with-backdrop-filter.html [ Failure ]
 crbug.com/591099 virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-parent-absolute-with-backdrop-filter.html [ Failure ]
+crbug.com/864567 paint/float/float-under-inline-self-painting-change.html [ Failure ]
+crbug.com/864567 paint/invalidation/compositing/iframe-inside-squashed-layer.html [ Failure ]
+crbug.com/864567 paint/invalidation/compositing/updating-scrolling-container.html [ Failure ]
+crbug.com/864567 paint/invalidation/forms/textarea-caret.html [ Failure ]
+crbug.com/864567 paint/invalidation/position/layout-state-only-positioned.html [ Failure ]
+crbug.com/864567 paint/invalidation/resize-iframe-text.html [ Failure ]
+crbug.com/864567 paint/invalidation/scroll/destroy-overlay-scrollbar.html [ Failure ]
+crbug.com/864567 paint/invalidation/scroll/destroy-scrollbar.html [ Failure ]
+crbug.com/864567 paint/invalidation/scroll/overflow-scroll-body-appear.html [ Failure ]
+crbug.com/864567 paint/invalidation/scroll/scrollbar-ancestor-clip-change.html [ Failure ]
+crbug.com/864567 paint/invalidation/scroll/scrolled-iframe-scrollbar-change.html [ Failure ]
+crbug.com/864567 paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1.html [ Failure ]
+crbug.com/864567 paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2.html [ Failure ]
+crbug.com/864567 paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1.html [ Failure ]
+crbug.com/864567 paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2.html [ Failure ]

third_party/blink/web_tests/FlagExpectations/enable-blink-features=CompositeAfterPaint

@@ -138,6 +138,11 @@ crbug.com/907601 virtual/threaded/fast/scrolling/events/scrollend-event-fired-af
 # Single pixel difference around one of the radiused borders.
 Bug(none) external/wpt/css/filter-effects/backdrop-filter-reference-filter.html [ Failure ]
 
+# Scrolling with the mouse wheel does not work.
+crbug.com/979352 virtual/threaded/fast/scrolling/non-composited-scroller-in-scrolled-absolute-scroller.html [ Failure ]
+crbug.com/979352 virtual/threaded/fast/scrolling/non-composited-scroller-in-scrolled-position-fixed-scroller.html [ Failure ]
+crbug.com/979352 virtual/threaded/fast/scrolling/non-composited-scroller-in-sticky.html [ Failure ]
+
 # Less invalidations or different invalidations without pixel failures.
 # Some might be good. Some might be under-invalidations for which under-invalidation
 # checking failed.

third_party/blink/web_tests/TestExpectations

@@ -2867,12 +2867,6 @@ crbug.com/769885 [ Linux ] virtual/android/fullscreen/video-scrolled-iframe.html
 crbug.com/492511 [ Mac ] fast/text/atsui-negative-spacing-features.html [ Failure ]
 crbug.com/492511 [ Mac ] fast/text/international/arabic-justify.html [ Failure ]
 
-### Tests added for non-fast scrolling regions that break as a result of compositor scrolling.
-# TODO(pdr): Mark these as passing when PaintNonFastScrollableRegions launches.
-crbug.com/817600 virtual/threaded/fast/scrolling/non-composited-scroller-in-scrolled-absolute-scroller.html [ Failure ]
-crbug.com/817600 virtual/threaded/fast/scrolling/non-composited-scroller-in-scrolled-position-fixed-scroller.html [ Failure ]
-crbug.com/817600 virtual/threaded/fast/scrolling/non-composited-scroller-in-sticky.html [ Failure ]
-
 # Ref tests that fail due to differences in inline box structure, even though they contain the same text.
 # This happens because inline box layout uses fixed-point measurements, which can cause rounding differences.
 crbug.com/321237 [ Mac ] fast/selectors/007a.html [ Failure ]

third_party/blink/web_tests/fast/events/touch/compositor-touch-hit-rects-global-expected.txt

 This tests verifies the hit test regions given to the compositor in the simple case where touch handles cover (or nearly cover) the entire document. It can only be run in DumpRenderTree.
 
+document: layer(0,0 800x600) has hit test rect (0,0 785x600)
 document: layer(0,0 785x2000) has hit test rect (0,0 785x2000)
 
 html: layer(0,0 785x2000) has hit test rect (0,0 785x2000)

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

@@ -18,7 +18,12 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow DIV id='container'",
+          "object": "LayoutNGBlockFlow DIV id='container'",
+          "rect": [8, 108, 210, 210],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutNGBlockFlow DIV id='container'",
           "rect": [8, 108, 210, 210],
           "reason": "style change"
         }

third_party/blink/web_tests/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt

@@ -17,6 +17,11 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
+        {
+          "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'",
+          "rect": [0, 50, 106, 206],
+          "reason": "geometry"
+        },
         {
           "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'",
           "rect": [0, 50, 106, 206],

third_party/blink/web_tests/paint/invalidation/forms/textarea-resize-property-change-expected.txt

@@ -21,6 +21,16 @@
           "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'",
           "rect": [0, 50, 106, 106],
           "reason": "style change"
+        },
+        {
+          "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'",
+          "rect": [0, 50, 106, 106],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'",
+          "rect": [0, 50, 106, 106],
+          "reason": "chunk appeared"
         }
       ]
     }

third_party/blink/web_tests/paint/invalidation/forms/textarea-set-disabled-expected.txt

@@ -17,6 +17,11 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
+        {
+          "object": "LayoutTextControl TEXTAREA",
+          "rect": [8, 8, 106, 106],
+          "reason": "subtree"
+        },
         {
           "object": "LayoutTextControl TEXTAREA",
           "rect": [8, 8, 106, 106],

third_party/blink/web_tests/paint/invalidation/position/layout-state-only-positioned-expected.txt

@@ -18,14 +18,24 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV",
+          "object": "LayoutNGBlockFlow (positioned) DIV",
           "rect": [0, 50, 106, 106],
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [0, 50, 106, 106],
           "reason": "chunk disappeared"
+        },
+        {
+          "object": "NGPhysicalBoxFragment LayoutNGBlockFlow (positioned) DIV",
+          "rect": [0, 50, 106, 106],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "VerticalScrollbar",
+          "rect": [88, 53, 15, 100],
+          "reason": "chunk appeared"
         }
       ]
     }

third_party/blink/web_tests/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt

@@ -18,7 +18,12 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV",
+          "object": "LayoutNGBlockFlow (positioned) DIV",
+          "rect": [0, 100, 200, 200],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutNGBlockFlow (positioned) DIV",
           "rect": [193, 100, 7, 200],
           "reason": "chunk disappeared"
         }

third_party/blink/web_tests/paint/invalidation/scroll/destroy-scrollbar-expected.txt

@@ -18,7 +18,12 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV",
+          "object": "LayoutNGBlockFlow (positioned) DIV",
+          "rect": [0, 100, 200, 200],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "VerticalScrollbar",
           "rect": [185, 100, 15, 200],
           "reason": "chunk disappeared"
         }

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

@@ -18,7 +18,12 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow DIV id='target'",
+          "object": "HorizontalScrollbar",
+          "rect": [8, 108, 100, 100],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutNGBlockFlow DIV id='target'",
           "rect": [8, 108, 100, 100],
           "reason": "incremental"
         }

third_party/blink/web_tests/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt

@@ -18,22 +18,27 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV id='overlay'",
+          "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'",
           "rect": [2, 2, 800, 600],
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutView #document",
+          "rect": [2, 2, 800, 600],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [10, 2, 784, 592],
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [10, 2, 769, 592],
           "reason": "chunk disappeared"
         },
         {
-          "object": "LayoutView #document",
+          "object": "VerticalScrollbar",
           "rect": [787, 2, 15, 600],
           "reason": "chunk disappeared"
         }

third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

@@ -18,10 +18,15 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [1, 1, 402, 202],
           "reason": "chunk appeared"
         },
+        {
+          "object": "HorizontalScrollbar",
+          "rect": [1, 1, 300, 150],
+          "reason": "chunk disappeared"
+        },
         {
           "object": "LayoutView #document",
           "rect": [1, 1, 300, 150],

third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

@@ -18,10 +18,15 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [1, 1, 402, 202],
           "reason": "chunk appeared"
         },
+        {
+          "object": "HorizontalScrollbar",
+          "rect": [1, 1, 300, 150],
+          "reason": "chunk disappeared"
+        },
         {
           "object": "LayoutView #document",
           "rect": [1, 1, 300, 150],

third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

@@ -18,10 +18,15 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [0, 0, 402, 202],
           "reason": "chunk appeared"
         },
+        {
+          "object": "HorizontalScrollbar",
+          "rect": [0, 0, 300, 150],
+          "reason": "chunk disappeared"
+        },
         {
           "object": "LayoutView #document",
           "rect": [0, 0, 300, 150],

third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

@@ -18,10 +18,15 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [0, 0, 402, 202],
           "reason": "chunk appeared"
         },
+        {
+          "object": "HorizontalScrollbar",
+          "rect": [0, 0, 300, 150],
+          "reason": "chunk disappeared"
+        },
         {
           "object": "LayoutView #document",
           "rect": [0, 0, 300, 150],

third_party/blink/web_tests/platform/linux/paint/float/float-under-inline-self-painting-change-expected.txt

@@ -18,13 +18,38 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 8, 306, 306],
           "reason": "chunk appeared"
         },
         {
           "object": "LayoutTextControl (floating) TEXTAREA id='target'",
           "rect": [8, 8, 306, 306],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "paint property change"
+        },
+        {
+          "object": "VerticalScrollbar",
+          "rect": [8, 8, 306, 306],
           "reason": "chunk disappeared"
         },
         {

third_party/blink/web_tests/platform/linux/paint/invalidation/resize-iframe-text-expected.txt

@@ -23,12 +23,17 @@
           "reason": "incremental"
         },
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutView #document",
+          "rect": [0, 0, 500, 200],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 300, 60, 22],
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutView #document",
+          "object": "VerticalScrollbar",
           "rect": [485, 0, 15, 200],
           "reason": "chunk disappeared"
         }

third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt

@@ -17,6 +17,11 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
+        {
+          "object": "Scrolling background of LayoutView #document",
+          "rect": [0, 0, 2008, 2096],
+          "reason": "background"
+        },
         {
           "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'",
           "rect": [124, 52, 383, 19],

third_party/blink/web_tests/platform/mac-mac10.10/paint/float/float-under-inline-self-painting-change-expected.txt

@@ -18,13 +18,38 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 8, 306, 306],
           "reason": "chunk appeared"
         },
         {
           "object": "LayoutTextControl (floating) TEXTAREA id='target'",
           "rect": [8, 8, 306, 306],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "paint property change"
+        },
+        {
+          "object": "VerticalScrollbar",
+          "rect": [8, 8, 306, 306],
           "reason": "chunk disappeared"
         },
         {

third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "drawsContent": false,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Scrolling Layer",
-      "bounds": [785, 600],
-      "drawsContent": false
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [785, 1016],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Squashing Containment Layer",
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow DIV id='foo'",
-      "bounds": [200, 1000],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3",
-      "transform": 1
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [8, 0],
-      "bounds": [300, 654],
-      "paintInvalidations": [
-        {
-          "object": "NGPhysicalTextFragment 'test1'",
-          "rect": [8, 508, 31, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "LayoutView #document",
-          "rect": [285, 500, 15, 150],
-          "reason": "chunk appeared"
-        }
-      ]
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt

-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "drawsContent": false,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Scrolling Layer",
-      "bounds": [785, 585],
-      "drawsContent": false
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [2008, 2092],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'",
-          "rect": [127, 50, 390, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'",
-          "rect": [8, 16, 348, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "NGPhysicalTextFragment 'This is the test for '",
-          "rect": [8, 50, 120, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "NGPhysicalTextFragment '.'",
-          "rect": [516, 50, 5, 18],
-          "reason": "geometry"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-retina/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "drawsContent": false,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Scrolling Layer",
-      "bounds": [785, 600],
-      "drawsContent": false
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [785, 1016],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Squashing Containment Layer",
-      "drawsContent": false
-    },
-    {
-      "name": "LayoutNGBlockFlow DIV id='foo'",
-      "bounds": [200, 1000],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3",
-      "transform": 1
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
-      "position": [8, 0],
-      "bounds": [300, 654],
-      "paintInvalidations": [
-        {
-          "object": "NGPhysicalTextFragment 'test1'",
-          "rect": [8, 508, 31, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "LayoutView #document",
-          "rect": [285, 500, 15, 150],
-          "reason": "chunk appeared"
-        }
-      ]
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-retina/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt

-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "drawsContent": false,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Scrolling Layer",
-      "bounds": [785, 585],
-      "drawsContent": false
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [2008, 2092],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'",
-          "rect": [127, 50, 390, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'",
-          "rect": [8, 16, 348, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "NGPhysicalTextFragment 'This is the test for '",
-          "rect": [8, 50, 120, 18],
-          "reason": "geometry"
-        },
-        {
-          "object": "NGPhysicalTextFragment '.'",
-          "rect": [516, 50, 5, 18],
-          "reason": "geometry"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac/paint/float/float-under-inline-self-painting-change-expected.txt

@@ -18,13 +18,38 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 8, 306, 306],
           "reason": "chunk appeared"
         },
         {
           "object": "LayoutTextControl (floating) TEXTAREA id='target'",
           "rect": [8, 8, 306, 306],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "paint property change"
+        },
+        {
+          "object": "VerticalScrollbar",
+          "rect": [8, 8, 306, 306],
           "reason": "chunk disappeared"
         },
         {

third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

@@ -22,29 +22,29 @@
       "drawsContent": false
     },
     {
-      "name": "LayoutBlockFlow DIV id='foo'",
+      "name": "LayoutNGBlockFlow DIV id='foo'",
       "bounds": [200, 1000],
       "contentsOpaque": true,
       "backgroundColor": "#D3D3D3",
       "transform": 1
     },
     {
-      "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)",
+      "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)",
       "position": [8, 0],
       "bounds": [300, 654],
       "paintInvalidations": [
         {
-          "object": "InlineTextBox 'test1'",
-          "rect": [8, 508, 31, 18],
-          "reason": "appeared"
+          "object": "LayoutView #document",
+          "rect": [0, 500, 300, 150],
+          "reason": "chunk appeared"
         },
         {
-          "object": "InlineTextBox 'test1'",
+          "object": "NGPhysicalTextFragment 'test1'",
           "rect": [8, 508, 31, 18],
-          "reason": "disappeared"
+          "reason": "geometry"
         },
         {
-          "object": "LayoutView #document",
+          "object": "VerticalScrollbar",
           "rect": [285, 500, 15, 150],
           "reason": "chunk appeared"
         }

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

@@ -17,6 +17,21 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
+        {
+          "object": "HorizontalScrollbar",
+          "rect": [5, 5, 167, 44],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [5, 5, 167, 44],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [5, 5, 167, 44],
+          "reason": "chunk appeared"
+        },
         {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [5, 5, 167, 44],
@@ -28,10 +43,25 @@
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [5, 5, 167, 44],
+          "reason": "paint property change"
+        },
+        {
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 8, 161, 38],
           "reason": "chunk disappeared"
         },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [8, 8, 161, 38],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [8, 8, 161, 38],
+          "reason": "paint property change"
+        },
         {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [9, 11, 159, 16],

third_party/blink/web_tests/platform/mac/paint/invalidation/resize-iframe-text-expected.txt

@@ -22,13 +22,18 @@
           "rect": [0, 200, 500, 200],
           "reason": "incremental"
         },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 500, 200],
+          "reason": "chunk disappeared"
+        },
         {
           "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 300, 61, 22],
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutView #document",
+          "object": "VerticalScrollbar",
           "rect": [485, 0, 15, 200],
           "reason": "chunk disappeared"
         }

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

@@ -18,44 +18,29 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'",
-          "rect": [127, 50, 390, 18],
-          "reason": "appeared"
+          "object": "Scrolling background of LayoutView #document",
+          "rect": [0, 0, 2008, 2092],
+          "reason": "background"
         },
         {
-          "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'",
+          "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'",
           "rect": [127, 50, 390, 18],
-          "reason": "disappeared"
+          "reason": "geometry"
         },
         {
-          "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'",
+          "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'",
           "rect": [8, 16, 348, 18],
-          "reason": "appeared"
-        },
-        {
-          "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'",
-          "rect": [8, 16, 348, 18],
-          "reason": "disappeared"
-        },
-        {
-          "object": "InlineTextBox 'This is the test for '",
-          "rect": [8, 50, 120, 18],
-          "reason": "appeared"
+          "reason": "geometry"
         },
         {
-          "object": "InlineTextBox 'This is the test for '",
+          "object": "NGPhysicalTextFragment 'This is the test for '",
           "rect": [8, 50, 120, 18],
-          "reason": "disappeared"
-        },
-        {
-          "object": "InlineTextBox '.'",
-          "rect": [516, 50, 5, 18],
-          "reason": "appeared"
+          "reason": "geometry"
         },
         {
-          "object": "InlineTextBox '.'",
+          "object": "NGPhysicalTextFragment '.'",
           "rect": [516, 50, 5, 18],
-          "reason": "disappeared"
+          "reason": "geometry"
         }
       ]
     }

third_party/blink/web_tests/platform/win/paint/float/float-under-inline-self-painting-change-expected.txt

@@ -18,13 +18,38 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 8, 306, 306],
           "reason": "chunk appeared"
         },
         {
           "object": "LayoutTextControl (floating) TEXTAREA id='target'",
           "rect": [8, 8, 306, 306],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl (floating) TEXTAREA id='target'",
+          "rect": [8, 8, 306, 306],
+          "reason": "paint property change"
+        },
+        {
+          "object": "VerticalScrollbar",
+          "rect": [8, 8, 306, 306],
           "reason": "chunk disappeared"
         },
         {

third_party/blink/web_tests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

@@ -33,13 +33,18 @@
       "position": [8, 0],
       "bounds": [300, 655],
       "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 500, 300, 150],
+          "reason": "chunk appeared"
+        },
         {
           "object": "NGPhysicalTextFragment 'test1'",
           "rect": [8, 508, 29, 19],
           "reason": "geometry"
         },
         {
-          "object": "LayoutView #document",
+          "object": "VerticalScrollbar",
           "rect": [285, 500, 15, 150],
           "reason": "chunk appeared"
         }

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

@@ -17,6 +17,21 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
+        {
+          "object": "HorizontalScrollbar",
+          "rect": [7, 7, 183, 40],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [7, 7, 183, 40],
+          "reason": "chunk appeared"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [7, 7, 183, 40],
+          "reason": "chunk appeared"
+        },
         {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [7, 7, 183, 40],
@@ -28,10 +43,25 @@
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutBlockFlow HTML",
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [7, 7, 183, 40],
+          "reason": "paint property change"
+        },
+        {
+          "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 8, 181, 38],
           "reason": "chunk disappeared"
         },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [8, 8, 181, 38],
+          "reason": "chunk disappeared"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [8, 8, 181, 38],
+          "reason": "paint property change"
+        },
         {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [9, 11, 179, 16],

third_party/blink/web_tests/platform/win/paint/invalidation/resize-iframe-text-expected.txt

@@ -22,13 +22,18 @@
           "rect": [0, 200, 500, 200],
           "reason": "incremental"
         },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 500, 200],
+          "reason": "chunk disappeared"
+        },
         {
           "object": "LayoutNGBlockFlow HTML",
           "rect": [8, 300, 64, 22],
           "reason": "chunk appeared"
         },
         {
-          "object": "LayoutView #document",
+          "object": "VerticalScrollbar",
           "rect": [485, 0, 15, 200],
           "reason": "chunk disappeared"
         }

third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt

@@ -17,6 +17,11 @@
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
+        {
+          "object": "Scrolling background of LayoutView #document",
+          "rect": [0, 0, 2008, 2096],
+          "reason": "background"
+        },
         {
           "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'",
           "rect": [118, 52, 370, 19],

third_party/blink/web_tests/scrollingcoordinator/non-fast-scrollable-region-scaled-iframe-expected.txt

@@ -3,7 +3,7 @@ This test ensures non-fast scrollable areas are calculated correctly when page i
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 PASS nonFastScrollableRects.length is 1
-PASS rectToString(nonFastScrollableRects[0]) is "[110, 110, 120, 120]"
+PASS rectToString(nonFastScrollableRects[0]) is "[220, 220, 240, 240]"
 PASS successfullyParsed is true
 
 TEST COMPLETE