Revert of Only promote opaque scrollers which are stacking contexts.

third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt

Index: third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
index 81404ab04a7a25ee1e97b168fbcdbc8f00045d8f..86822d82c28afa965293ba6e5ae7d9c143a81019 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
@@ -3,6 +3,24 @@
     {
       "name": "LayoutView #document",
       "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow DIV id='scroller'",
+      "bounds": [200, 100],
+      "shouldFlattenTransform": false,
+      "drawsContent": true,
+      "backgroundColor": "#808080"
+    },
+    {
+      "name": "Scrolling Layer",
+      "bounds": [185, 100],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [185, 210],
       "contentsOpaque": true,
       "drawsContent": true,
       "paintInvalidations": [
@@ -12,23 +30,65 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutBlockFlow DIV id='scroller'",
-          "rect": [185, 0, 15, 100],
-          "reason": "scroll"
+          "object": "LayoutText #text",
+          "rect": [0, 5, 15, 15],
+          "reason": "full"
+        }
+      ]
+    },
+    {
+      "name": "Overflow Controls Host Layer",
+      "bounds": [200, 100]
+    },
+    {
+      "name": "Vertical Scrollbar Layer",
+      "position": [185, 0],
+      "bounds": [15, 100],
+      "paintInvalidations": [
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 210],
+          "reason": "full"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [0, 5, 15, 15],
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 210],
+          "reason": "full"
+        },
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 210],
+          "reason": "full"
+        },
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 100],
+          "reason": "full"
+        },
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 100],
+          "reason": "full"
+        },
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 100],
+          "reason": "full"
+        },
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 100],
+          "reason": "full"
+        },
+        {
+          "object": "Vertical Scrollbar Layer",
+          "rect": [0, 0, 15, 100],
           "reason": "full"
         }
       ]
     }
   ],
   "objectPaintInvalidations": [
-    {
-      "object": "VerticalScrollbar",
-      "reason": "scroll"
-    },
     {
       "object": "LayoutBlockFlow DIV id='dynamic' class='content'",
       "reason": "forced by layout"