Revert of Revert "Disable local background equivalence when we have a box shadow due to painting bug

third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt

Index: third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cd12323f9edac4921308e1317421d15045a51d03
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt
@@ -0,0 +1,208 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='outer A'",
+      "position": [6, 6],
+      "bounds": [340, 282],
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) DIV class='scroller'",
+      "position": [32, 32],
+      "bounds": [278, 218],
+      "shouldFlattenTransform": false,
+      "drawsContent": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "Scrolling Layer",
+      "position": [29, 29],
+      "bounds": [220, 160],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [220, 236],
+      "drawsContent": true
+    },
+    {
+      "name": "Overflow Controls Host Layer",
+      "position": [24, 24],
+      "bounds": [230, 170]
+    },
+    {
+      "name": "Vertical Scrollbar Layer",
+      "position": [218, 5],
+      "bounds": [7, 160]
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='outer B'",
+      "position": [355, 6],
+      "bounds": [340, 282],
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='scroller'",
+      "position": [32, 32],
+      "bounds": [278, 218],
+      "shouldFlattenTransform": false,
+      "drawsContent": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "Scrolling Layer",
+      "position": [29, 29],
+      "bounds": [220, 160],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [220, 236],
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) DIV class='content'",
+      "position": [73, 73],
+      "bounds": [196, 212],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "backgroundColor": "#DDDDDD"
+    },
+    {
+      "name": "Overflow Controls Host Layer",
+      "position": [56, 56],
+      "bounds": [230, 170]
+    },
+    {
+      "name": "Vertical Scrollbar Layer",
+      "position": [218, 5],
+      "bounds": [7, 160]
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='outer C'",
+      "position": [6, 297],
+      "bounds": [340, 282],
+      "drawsContent": true
+    },
+    {
+      "name": "Ancestor Clipping Layer",
+      "position": [40, 40],
+      "bounds": [260, 100],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='scroller'",
+      "position": [-9, -9],
+      "bounds": [278, 218],
+      "shouldFlattenTransform": false,
+      "drawsContent": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "Scrolling Layer",
+      "position": [29, 29],
+      "bounds": [220, 160],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [220, 236],
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) DIV class='content'",
+      "position": [72, 72],
+      "bounds": [196, 212],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "backgroundColor": "#DDDDDD"
+    },
+    {
+      "name": "Overflow Controls Ancestor Clipping Layer",
+      "position": [40, 40],
+      "bounds": [260, 100]
+    },
+    {
+      "name": "Overflow Controls Host Layer",
+      "position": [15, 15],
+      "bounds": [230, 170]
+    },
+    {
+      "name": "Vertical Scrollbar Layer",
+      "position": [218, 5],
+      "bounds": [7, 160]
+    },
+    {
+      "name": "LayoutBlockFlow (positioned) DIV class='outer D'",
+      "position": [355, 297],
+      "bounds": [340, 282],
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) DIV class='clipper'",
+      "position": [24, 24],
+      "bounds": [292, 200],
+      "drawsContent": true
+    },
+    {
+      "name": "Child Containment Layer",
+      "position": [10, 10],
+      "bounds": [272, 180]
+    },
+    {
+      "name": "Ancestor Clipping Layer",
+      "position": [6, 6],
+      "bounds": [260, 100],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "LayoutBlockFlow DIV class='scroller'",
+      "position": [-9, -9],
+      "bounds": [278, 218],
+      "shouldFlattenTransform": false,
+      "drawsContent": true,
+      "backgroundColor": "#FFFFFF"
+    },
+    {
+      "name": "Scrolling Layer",
+      "position": [29, 29],
+      "bounds": [220, 160],
+      "shouldFlattenTransform": false
+    },
+    {
+      "name": "Scrolling Contents Layer",
+      "bounds": [220, 236],
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) DIV class='content'",
+      "position": [72, 72],
+      "bounds": [196, 212],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "backgroundColor": "#DDDDDD"
+    },
+    {
+      "name": "Overflow Controls Ancestor Clipping Layer",
+      "position": [40, 40],
+      "bounds": [260, 100]
+    },
+    {
+      "name": "Overflow Controls Host Layer",
+      "position": [15, 15],
+      "bounds": [230, 170]
+    },
+    {
+      "name": "Vertical Scrollbar Layer",
+      "position": [218, 5],
+      "bounds": [7, 160]
+    }
+  ]
+}
+