Drop background color optimization for composited layers

Rationale 1. GraphicsLayer deals with background-color layer as a contents layer, so a background-color layer is in trouble in terms of the correct order with negative z-order children. 2. CompositedLayerMapping has the big hack to decide the given layer can be background-color layer. Unfortunately, the big hack is incomplete and invasive. 3. Hybrid Accelerated Rasterization will cover this optimization in more generic way. 4. background-color layer covers very limited cases. A layer-promoted box object must not have children, not have decoration, only have a background-color property. BUG=114658, 340691 TEST=compositing/background-color/background-color-drawn-over-child.html, compositing/* Review URL: https://codereview.chromium.org/178013003 git-svn-id: svn://svn.chromium.org/blink/trunk@168245 bbb929c8-8fbe-4397-9dbb-9b2b20218538
author: dongseong.hwang@intel.com <dongseong.hwang@intel.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> 2014-03-01 14:44:48 +0000
committer: dongseong.hwang@intel.com <dongseong.hwang@intel.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> 2014-03-01 14:44:48 +0000
commit: 8580eba80e6560829b349dfb4f23c35fc9958bdc (patch)
tree: 85301553604aa79af64a3920cb12d2035fe8d6ed /third_party
parent: 4909dead01a48ddf024e1e4bef0d0a2ad79d161c (diff)
download: chromium_src-8580eba80e6560829b349dfb4f23c35fc9958bdc.zip
chromium_src-8580eba80e6560829b349dfb4f23c35fc9958bdc.tar.gz
chromium_src-8580eba80e6560829b349dfb4f23c35fc9958bdc.tar.bz2
149 files changed, 800 insertions, 159 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 4134105..b6c4195 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -603,6 +603,88 @@ crbug.com/302529 svg/custom/js-late-clipPath-and-object-creation.svg [ ImageOnly
 crbug.com/255714 [ Linux ] editing/execCommand/switch-list-type-with-orphaned-li.html [ Failure Pass ]
 crbug.com/231910 fast/dom/vertical-scrollbar-in-rtl.html [ Failure Pass ]
 
+# Drop background color optimization for composited layers
+crbug.com/114658 compositing/backing/no-backing-for-clip.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/backing/no-backing-for-clip-overlap.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/backing/no-backing-for-perspective.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/geometry/bounds-ignores-hidden-composited-descendant.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/geometry/bounds-ignores-hidden-dynamic-negzindex.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/geometry/composited-in-columns.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/geometry/layer-due-to-layer-children-deep-switch.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/geometry/limit-layer-bounds-overflow-root.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/geometry/preserve-3d-switching.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/invisible-nested-iframe-show.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/scrolling-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/layer-creation/no-compositing-for-preserve-3d.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective.html [ NeedsRebaseline ]
+crbug.com/114658 [ Linux Win Android ] compositing/overflow/clear-scroll-parent.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/overflow/composited-scrolling-creates-a-stacking-container.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/overflow/composited-scrolling-paint-phases.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/overflow/do-not-opt-non-stacking-context-descendants-into-composited-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/overflow/opt-in-all-layers-after-unclipped-descendant.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/overflow/opt-unclipped-descendants-into-composited-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 [ Linux Win Mac ] compositing/repaint/invalidations-on-composited-layers.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/3d-corners.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/perpendicular-layer-sorting.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/scaling/tiled-layer-recursion.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/backing/no-backing-for-clip-overlap.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/backing/no-backing-for-clip.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/backing/no-backing-for-perspective.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/bounds-ignores-hidden-composited-descendant.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/bounds-ignores-hidden-dynamic-negzindex.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/composited-in-columns.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-switch.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/limit-layer-bounds-overflow-root.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/preserve-3d-switching.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/iframes/invisible-nested-iframe-show.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/iframes/scrolling-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/layer-creation/no-compositing-for-preserve-3d.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/clear-scroll-parent.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/composited-scrolling-paint-phases.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/do-not-opt-non-stacking-context-descendants-into-composited-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/opt-in-all-layers-after-unclipped-descendant.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/overflow/opt-unclipped-descendants-into-composited-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/repaint/invalidations-on-composited-layers.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/rtl/rtl-iframe-absolute.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/rtl/rtl-iframe-fixed.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/rtl/rtl-iframe-relative.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/3d-corners.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/backface-visibility-transformed.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/fixed-in-composited.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/geometry/video-fixed-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/perpendicular-layer-sorting.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/reflections/animation-inside-reflection.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/scaling/tiled-layer-recursion.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/transitions/scale-transition-no-start.html [ NeedsRebaseline ]
+crbug.com/114658 transforms/3d/general/perspective-units.html [ NeedsRebaseline ]
+crbug.com/114658 transforms/3d/general/transform-origin-z-change.html [ NeedsRebaseline ]
+crbug.com/114658 transforms/3d/point-mapping/3d-point-mapping-3.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/accelerated-overflow-scroll-should-not-affect-perspective.html [ NeedsRebaseline ]
+crbug.com/114658 [ Linux Win Android ] virtual/gpu/compositedscrolling/overflow/clear-scroll-parent.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/composited-scrolling-paint-phases.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/content-gains-scrollbars.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/do-not-opt-non-stacking-context-descendants-into-composited-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/opt-in-all-layers-after-unclipped-descendant.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/opt-unclipped-descendants-into-composited-scrolling.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/gpu/compositedscrolling/overflow/overflow-scrollbar-layers.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/become-overlapped-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/composited-parent-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/connect-compositing-iframe2.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/connect-compositing-iframe3.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/connect-compositing-iframe-delayed.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/connect-compositing-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/enter-compositing-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/iframe-resize.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/iframe-size-from-zero.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/overlapped-iframe.html [ NeedsRebaseline ]
+crbug.com/114658 compositing/iframes/resizer.html [ NeedsRebaseline ]
+crbug.com/114658 virtual/softwarecompositing/layout-width-change.html [ NeedsRebaseline ]
+
 # Mac has overlay scrollbars depending on external settings.
 crbug.com/304841 [ SnowLeopard ] inspector/device-emulation/device-emulation-320-2x.html [ Failure ]
 crbug.com/304841 [ SnowLeopard ] inspector/device-emulation/device-emulation-320.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/compositing/background-color/background-color-drawn-over-child-expected.html b/third_party/WebKit/LayoutTests/compositing/background-color/background-color-drawn-over-child-expected.html
new file mode 100644
index 0000000..807c193
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/compositing/background-color/background-color-drawn-over-child-expected.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <style type="text/css">
+    #backgournd_color_container {
+      background-color: green;
+      position: absolute;
+      -webkit-transform: translateZ(0);
+    }
+    #nested_container {
+      width: 200px;
+      height: 200px;
+      position: relative;
+    }
+    #issue {
+      width: 100px;
+      height: 100px;
+      background-color: red;
+      position: absolute;
+    }
+    #compositing {
+      left: 100px;
+      top: 100px;
+      width: 100px;
+      height: 100px;
+      position: absolute;
+      background-color: blue;
+      -webkit-transform: translateZ(0);
+    }
+  </style>
+</head>
+<body>
+  <div id="backgournd_color_container">
+    <div id="nested_container">
+      <div id="issue"></div>
+      <div id="compositing"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/compositing/background-color/background-color-drawn-over-child.html b/third_party/WebKit/LayoutTests/compositing/background-color/background-color-drawn-over-child.html
new file mode 100644
index 0000000..82e73c6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/compositing/background-color/background-color-drawn-over-child.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+  The background color of #backgournd_color_container div MUST be drawn below all children.
+  However, the background color is drawn over the child #issue div.
+  It's a minimal case of https://www.google.com/maps/views/explore?gl=us
+  See crbug.com/345613
+  </title>
+  <style type="text/css">
+    #backgournd_color_container {
+      background-color: green;
+      position: absolute;
+      overflow: hidden;
+      z-index: 0;
+    }
+    #nested_container {
+      width: 200px;
+      height: 200px;
+      position: relative;
+      overflow: hidden;
+      z-index: 0;
+    }
+    #issue {
+      width: 100px;
+      height: 100px;
+      background-color: red;
+      position: absolute;
+    }
+    #compositing {
+      left: 100px;
+      top: 100px;
+      width: 100px;
+      height: 100px;
+      position: absolute;
+      background-color: blue;
+      -webkit-transform: translateZ(0);
+    }
+  </style>
+</head>
+<body>
+  <div id="backgournd_color_container">
+    <div id="nested_container">
+      <div id="issue"></div>
+      <div id="compositing"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt b/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt
index 9979181..909506a 100644
--- a/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/columns/composited-in-paginated-expected.txt
@@ -10,6 +10,8 @@
           (position 818.00 145.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt
index 4fee254..73cfa52 100644
--- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/background-color-expected.txt
@@ -13,11 +13,15 @@
         (GraphicsLayer
           (position 8.00 108.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
+          (backgroundColor #00FF007F)
         )
         (GraphicsLayer
           (position 8.00 208.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-painted-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-painted-expected.txt
index 5b25ec5..229aefb 100644
--- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-painted-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-painted-expected.txt
@@ -15,6 +15,8 @@
               (position 8.00 8.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
             (GraphicsLayer
               (bounds 800.00 600.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-skipped-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-skipped-expected.txt
index cd1c4d7..081bd84 100644
--- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-skipped-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/body-background-skipped-expected.txt
@@ -14,6 +14,8 @@
               (position 8.00 8.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
             (GraphicsLayer
               (bounds 800.00 600.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt
index ffd8565..1646cfb 100644
--- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-opacity-expected.txt
@@ -11,6 +11,8 @@
           (bounds 100.00 100.00)
           (opacity 0.50)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt
index ed21466..1ebf3c0 100644
--- a/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/contents-opaque/layer-transform-expected.txt
@@ -10,6 +10,8 @@
           (position 8.00 8.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (transform [0.87 0.50 0.00 0.00] [-0.50 0.87 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
         )
       )
diff --git a/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt b/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
index 95aa7bc..440c67e 100644
--- a/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
@@ -16,6 +16,8 @@
         (GraphicsLayer
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
index 7ea9de0..67a06a1 100644
--- a/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
@@ -10,6 +10,8 @@
           (position 105.00 105.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #000000)
         )
         (GraphicsLayer
           (bounds 125.00 125.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
index b55113d..177ff25 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
@@ -9,6 +9,8 @@
         (GraphicsLayer
           (position 6.00 6.00)
           (bounds 104.00 104.00)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
         )
       )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt
index 1145292..a17acb3 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt
@@ -22,6 +22,8 @@ Test CSS clip with composited layers. Left and right sides should look the same.
             (GraphicsLayer
               (position -5.00 -5.00)
               (bounds 120.00 120.00)
+              (drawsContent 1)
+              (backgroundColor #00000033)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt
index 57c9d82..7de9778 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt
@@ -24,6 +24,8 @@ Test CSS clip with composited layers. Left and right sides should look the same.
             (GraphicsLayer
               (position -15.00 -25.00)
               (bounds 120.00 120.00)
+              (drawsContent 1)
+              (backgroundColor #00000033)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-with-shadow-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-with-shadow-expected.txt
index 910f1bf..c5fb2f6 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-with-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-with-shadow-expected.txt
@@ -20,6 +20,8 @@
             (GraphicsLayer
               (position -5.00 -5.00)
               (bounds 120.00 120.00)
+              (drawsContent 1)
+              (backgroundColor #00000033)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt
index d3a8240..7096159 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt
@@ -13,6 +13,8 @@ After (should not be empty):
           (position 480.00 30.00)
           (bounds 300.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
index 34e7105..34787dc 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
@@ -10,6 +10,8 @@
           (position 18.00 10.00)
           (bounds 250.00 200.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
           (children 1
             (GraphicsLayer
               (position 35.00 10.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt
index 949c8fe..1c6c904 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt
@@ -10,11 +10,15 @@
           (position 100.00 3100.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 100.00 3100.00)
           (bounds 200.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
index ac6ba12..e981a4c 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
@@ -15,6 +15,8 @@ Text here
           (position 29.00 134.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 113.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
index aee65b2..2be683d 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
@@ -15,6 +15,8 @@ Text here
           (position 29.00 29.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
index ad850fa..a0a7527 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
@@ -15,6 +15,8 @@ Text here
           (position 29.00 29.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
index 2fb9e26..e8891a8 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
@@ -15,6 +15,8 @@ Text here
           (position 129.00 29.00)
           (bounds 200.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position -971.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
index 49f81ae..0b3423e 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
@@ -15,6 +15,8 @@ middle
           (position 129.00 29.00)
           (bounds 200.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 8.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt
index 9d416a4..449b5b1 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt
@@ -51,6 +51,8 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
+                                                          (drawsContent 1)
+                                                          (backgroundColor #0000FF)
                                                         )
                                                       )
                                                     )
@@ -120,6 +122,8 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
+                                                          (drawsContent 1)
+                                                          (backgroundColor #0000FF)
                                                         )
                                                       )
                                                     )
@@ -148,6 +152,8 @@
         (GraphicsLayer
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt
index 2b2cf51..334adeb 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 150.00 150.00)
+          (drawsContent 1)
+          (backgroundColor #00000099)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
index b6fc52e..1e313ae 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
index c51a80b..82fefba 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
@@ -33,6 +33,8 @@ When the parent document becomes composited, the layer trees should get connecte
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -55,6 +57,8 @@ When the parent document becomes composited, the layer trees should get connecte
           (position 8.00 8.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt
index ebf39e8..6342514 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt
index 3b734f1..032cf17 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-resize-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt
index 187b2e2..b7f10c5 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/iframe-size-from-zero-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt
index c619b87..f48e2f2 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt
@@ -10,6 +10,8 @@
           (position 18.00 10.00)
           (bounds 210.00 210.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt
index 2cf6c68..b471e15 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt
@@ -29,6 +29,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt
index 1427785..f2bf871 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/overlapped-nested-iframes-expected.txt
@@ -51,6 +51,8 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
+                                                          (drawsContent 1)
+                                                          (backgroundColor #0000FF)
                                                         )
                                                       )
                                                     )
@@ -120,6 +122,8 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
+                                                          (drawsContent 1)
+                                                          (backgroundColor #0000FF)
                                                         )
                                                       )
                                                     )
@@ -148,6 +152,8 @@
         (GraphicsLayer
           (position 0.00 100.00)
           (bounds 785.00 120.00)
+          (drawsContent 1)
+          (backgroundColor #0000007F)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt b/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt
index 7007209..436739b 100644
--- a/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/iframes/resizer-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt
index 48aece5..414e635 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt
@@ -17,6 +17,8 @@ Should be composited
               (position 6.00 6.00)
               (bounds 250.00 50.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #C0C0C0)
             )
             (GraphicsLayer
               (position 11.00 21.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt
index 46a5693..659078a 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt
@@ -10,11 +10,15 @@
           (position 100.00 1100.00)
           (bounds 256.00 256.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 1000.00)
           (bounds 500.00 500.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
index 62c5454..b8ee371 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
@@ -12,11 +12,15 @@ Layer tree when the fixed elements are in-view (both fixed elements should have
           (position 100.00 50.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 100.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt
index e69dde3..00d460b 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt
@@ -12,6 +12,8 @@ Even though the fixed-position element's container is nonscrollable, it should s
           (position 10.00 100.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #00FF00)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt
index c86cf28..200b54c 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt
@@ -12,11 +12,15 @@ Even though we can opt-out of fixed-position compositing for unscrollable fixed-
           (position 10.00 100.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 10.00 100.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #00FF00)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-expected.txt
index 7cc3d55..2fffe86 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-expected.txt
@@ -12,6 +12,8 @@
             (GraphicsLayer
               (bounds 10.00 10.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #C0C0C0)
             )
             (GraphicsLayer
               (bounds 785.00 1021.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt
index ee5ef36..eed22dc 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt
@@ -12,6 +12,8 @@ BEFORE:
           (position 20.00 -80.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 100.00 0.00 1.00])
         )
       )
@@ -31,6 +33,8 @@ AFTER:
           (position 20.00 -70.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 100.00 0.00 1.00])
         )
       )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
index 13db892..fc5d8a2 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
@@ -11,10 +11,14 @@ Not scaled:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -33,20 +37,28 @@ Scale=0.5:
           (position 8.00 1008.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 1000.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -64,6 +76,8 @@ Scale=1.5:
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
index f188565..fc414fb 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
@@ -11,11 +11,15 @@ Not scaled:
           (position 600.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 0.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -34,20 +38,28 @@ Scale=0.5:
           (position 8.00 1008.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 1000.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -65,6 +77,8 @@ Scale=1.5:
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt
index 0108b668..d62e176 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt
@@ -18,6 +18,8 @@
           (position 0.00 1000.00)
           (bounds 500.00 500.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt
index a38137f..471b16a 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt
@@ -30,6 +30,8 @@
               (position 20.00 45.00)
               (bounds 210.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
           )
         )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt
index 8711b66..de8483ec 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-clipping-expected.txt
@@ -10,6 +10,8 @@
           (position 18.00 120.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform ...)
         )
         (GraphicsLayer
@@ -27,18 +29,24 @@
                   (position 10.00 10.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #808080)
                   (transform ...)
                 )
                 (GraphicsLayer
                   (position 10.00 230.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #0000FF)
                   (transform ...)
                 )
                 (GraphicsLayer
                   (position 10.00 340.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #FFFF00)
                 )
               )
             )
@@ -48,6 +56,8 @@
           (position 18.00 702.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FFFF00)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt
index 0cd3db3..c5f86bf 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-container-expected.txt
@@ -10,6 +10,8 @@ Before:
         (GraphicsLayer
           (position 17.00 119.00)
           (bounds 102.00 102.00)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform ...)
         )
         (GraphicsLayer
@@ -21,6 +23,8 @@ Before:
             (GraphicsLayer
               (position 21.00 11.00)
               (bounds 102.00 102.00)
+              (drawsContent 1)
+              (backgroundColor #808080)
               (transform ...)
             )
           )
@@ -28,6 +32,8 @@ Before:
         (GraphicsLayer
           (position 17.00 691.00)
           (bounds 102.00 102.00)
+          (drawsContent 1)
+          (backgroundColor #FFFF00)
         )
       )
     )
@@ -46,6 +52,8 @@ After:
         (GraphicsLayer
           (position 17.00 119.00)
           (bounds 102.00 102.00)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform ...)
         )
         (GraphicsLayer
@@ -57,6 +65,8 @@ After:
             (GraphicsLayer
               (position 11.00 11.00)
               (bounds 102.00 102.00)
+              (drawsContent 1)
+              (backgroundColor #808080)
               (transform ...)
             )
             (GraphicsLayer
@@ -84,6 +94,8 @@ After:
         (GraphicsLayer
           (position 17.00 691.00)
           (bounds 102.00 102.00)
+          (drawsContent 1)
+          (backgroundColor #FFFF00)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt
index 772125a..bb9f753 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt
@@ -18,12 +18,16 @@
                   (position 10.00 10.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #0000FF)
                   (transform ...)
                 )
                 (GraphicsLayer
                   (position 10.00 120.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #0000FF)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt
index 4fef041..1e03528 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt
@@ -15,6 +15,8 @@
         (GraphicsLayer
           (bounds 300.00 300.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt
index ac377ab..f862b60 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt
@@ -13,6 +13,8 @@
             (GraphicsLayer
               (bounds 500.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
           )
         )
@@ -20,11 +22,15 @@
           (position 50.00 200.00)
           (bounds 500.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 450.00 200.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt
index da2a845..e20a928 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-3d-expected.txt
@@ -11,6 +11,8 @@ Before:
           (position 108.00 108.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 -1.00 1.00])
         )
       )
@@ -31,27 +33,37 @@ After:
           (position 108.00 108.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 -1.00 1.00])
         )
         (GraphicsLayer
           (position 8.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 208.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 8.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 208.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
index cd35acd..97ed0a8 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
@@ -16,10 +16,14 @@
                 (GraphicsLayer
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #FF0000)
                 )
                 (GraphicsLayer
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #008000)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt
index 24d5ff7..71b76ae 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt
@@ -22,6 +22,8 @@
         (GraphicsLayer
           (bounds 300.00 300.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt
index 5159fc5..4b1f01c 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt
@@ -27,6 +27,8 @@
             (GraphicsLayer
               (bounds 300.00 300.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
           )
         )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
index dab8191..9c866b9 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
@@ -149,21 +149,29 @@ After:
           (position 8.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 208.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 8.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 208.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt
index 69beb98..0d1f850 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt
@@ -18,6 +18,8 @@
                   (position 10.00 10.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #0000FF)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
                 )
               )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt
index e4cbd36..467133e 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt
@@ -14,6 +14,8 @@ scroll me
         (GraphicsLayer
           (position 10.00 10.00)
           (bounds 400.00 100.00)
+          (drawsContent 1)
+          (backgroundColor #0000007F)
         )
         (GraphicsLayer
           (position 200.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt
index 34a437c..8428d2b 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt
@@ -14,6 +14,8 @@
           (position 8.00 8.00)
           (bounds 100.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt
index 095fe06..f3a2362 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt
@@ -10,6 +10,8 @@
           (position 8.00 8.00)
           (bounds 20.00 20.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
         (GraphicsLayer
           (position 8.00 18.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
index ae01683..826eb24 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
@@ -23,6 +23,8 @@
         (GraphicsLayer
           (position 65.00 65.00)
           (bounds 76.00 76.00)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt
index d58b874..502db84 100644
--- a/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt
@@ -10,6 +10,8 @@
           (position 18.00 10.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt
index 7190fee..f5ffc5b 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt
@@ -14,12 +14,16 @@ flat
           (contentsOpaque 1)
           (shouldFlattenTransform 0)
           (3dRenderingContext 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
         )
         (GraphicsLayer
           (position 18.00 120.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
         )
       )
diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt
index b8f5ee6..a2e72d8 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/clip-descendents-expected.txt
@@ -14,6 +14,8 @@
               (position 2.00 12.00)
               (bounds 100.00 150.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
@@ -26,6 +28,8 @@
               (position 2.00 12.00)
               (bounds 100.00 150.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
@@ -41,6 +45,8 @@
                   (position 2.00 12.00)
                   (bounds 100.00 150.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #808080)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
                 )
               )
@@ -58,6 +64,8 @@
                   (position 2.00 12.00)
                   (bounds 100.00 150.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #808080)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
                 )
               )
diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt
index ca49d15..8366085f 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,6 +29,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -47,6 +49,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
@@ -76,12 +79,14 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 100.00)
               (children 1
                 (GraphicsLayer
                   (bounds 10.00 10.00)
+                  (drawsContent 1)
                   (children 1
                     (GraphicsLayer
                     )
diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt
index ca49d15..8366085f 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,6 +29,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -47,6 +49,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
@@ -76,12 +79,14 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 100.00)
               (children 1
                 (GraphicsLayer
                   (bounds 10.00 10.00)
+                  (drawsContent 1)
                   (children 1
                     (GraphicsLayer
                     )
diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt b/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt
index 94da5af..3546f2d 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/resize-painting-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 85.00 85.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt b/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
index 25231cd..d4bfa65 100644
--- a/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rendering-contexts-expected.txt
@@ -12,17 +12,23 @@
           (contentsOpaque 1)
           (shouldFlattenTransform 0)
           (3dRenderingContext 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (children 1
             (GraphicsLayer
               (bounds 100.00 100.00)
               (contentsOpaque 1)
               (3dRenderingContext 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
               (children 1
                 (GraphicsLayer
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
                   (shouldFlattenTransform 0)
                   (3dRenderingContext 2)
+                  (drawsContent 1)
+                  (backgroundColor #008000)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-inside-composited-intermediate-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-inside-composited-intermediate-layer-expected.txt
index c770809..9c9d3e6 100644
--- a/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-inside-composited-intermediate-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-inside-composited-intermediate-layer-expected.txt
@@ -10,6 +10,8 @@
           (position 8.00 8.00)
           (bounds 500.00 500.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #00FFFF)
         )
         (GraphicsLayer
           (position 20.00 20.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-with-composited-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-with-composited-child-expected.txt
index cd5385d..0ec5ce0 100644
--- a/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-with-composited-child-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-with-composited-child-expected.txt
@@ -13,6 +13,7 @@
           (position 0.00 600.00)
           (bounds 400.00 100.00)
           (contentsOpaque 1)
+          (backgroundColor #A0A0A0)
           (children 1
             (GraphicsLayer
               (bounds 400.00 100.00)
@@ -20,6 +21,8 @@
                 (GraphicsLayer
                   (bounds 200.00 100.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #00A0A0)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/compositing/repaint/repaint-into-ancestor-after-layout-expected.txt b/third_party/WebKit/LayoutTests/compositing/repaint/repaint-into-ancestor-after-layout-expected.txt
index 82a9dde..ab2c5d6 100644
--- a/third_party/WebKit/LayoutTests/compositing/repaint/repaint-into-ancestor-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/repaint/repaint-into-ancestor-after-layout-expected.txt
@@ -14,6 +14,7 @@
           (position 50.00 10.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (backgroundColor #00FF00)
           (children 1
             (GraphicsLayer
               (bounds 100.00 100.00)
@@ -21,6 +22,8 @@
                 (GraphicsLayer
                   (bounds 50.00 50.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #00FFFF)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt
index 684dc55..8b3d0e4 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-expected.txt
@@ -10,6 +10,8 @@
           (position 50.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt
index 3b58957..d03e5d4 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt
@@ -11,6 +11,8 @@
           (position 265.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
index faf0f20..191add4 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
@@ -11,6 +11,8 @@
           (position 51.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt
index 684dc55..8b3d0e4 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-expected.txt
@@ -10,6 +10,8 @@
           (position 50.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt
index 3b58957..d03e5d4 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt
@@ -11,6 +11,8 @@
           (position 265.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
index faf0f20..191add4 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
@@ -11,6 +11,8 @@
           (position 51.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt
index 82fed0d..110ba4b 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-expected.txt
@@ -28,6 +28,8 @@
                                   (position 50.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt
index 9a3d694..6e6b538 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt
@@ -29,6 +29,8 @@
                                   (position 665.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
index 71f3d8c..c931cdc 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
@@ -29,6 +29,8 @@
                                   (position 51.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt
index 82fed0d..110ba4b 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-expected.txt
@@ -28,6 +28,8 @@
                                   (position 50.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt
index 9a3d694..6e6b538 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt
@@ -29,6 +29,8 @@
                                   (position 665.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
index 9a3d694..6e6b538 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
@@ -29,6 +29,8 @@
                                   (position 665.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt
index 509fb70..b8a4955 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative-expected.txt
@@ -28,6 +28,8 @@
                                   (position 242.00 58.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt
index 178263b..30c536d 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative-expected.txt
@@ -10,6 +10,8 @@
           (position 642.00 58.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/add-remove-squashed-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/add-remove-squashed-layers-expected.txt
index 1c49661..ee3dcee 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/add-remove-squashed-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/add-remove-squashed-layers-expected.txt
@@ -15,6 +15,8 @@ CASE 1, original layer tree with overlap1 and overlap2:
               (position 60.00 60.00)
               (bounds 400.00 400.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -45,6 +47,8 @@ CASE 2, overlap3 gets added:
               (position 60.00 60.00)
               (bounds 400.00 400.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -75,6 +79,8 @@ CASE 3, overlap2 gets removed. Since this does not resize the layer, there shoul
               (position 60.00 60.00)
               (bounds 400.00 400.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -105,6 +111,8 @@ CASE 4, overlap1 gets removed:
               (position 60.00 60.00)
               (bounds 400.00 400.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 300.00 300.00)
@@ -138,6 +146,8 @@ CASE 5, overlap2 gets added back:
               (position 60.00 60.00)
               (bounds 400.00 400.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 220.00 220.00)
@@ -172,6 +182,8 @@ CASE 6, overlap1 gets added back, and overlap3 gets removed:
               (position 60.00 60.00)
               (bounds 400.00 400.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/move-squashing-layer-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/move-squashing-layer-expected.txt
index cab0ff8..f85f28e 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/move-squashing-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/move-squashing-layer-expected.txt
@@ -12,6 +12,8 @@ This tests that squashed layers' offset from renderer is updated properly. If no
           (position 8.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FFFF00)
         )
         (GraphicsLayer
           (children 2
@@ -19,6 +21,8 @@ This tests that squashed layers' offset from renderer is updated properly. If no
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
             (GraphicsLayer
               (position 8.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt
index 71549bc..b9d30f0 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt
@@ -15,6 +15,8 @@ CASE 1, original layer tree:
           (position 100.00 150.00)
           (bounds 300.00 300.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #D3D3D3)
         )
         (GraphicsLayer
           (children 2
@@ -22,6 +24,8 @@ CASE 1, original layer tree:
               (position 0.00 100.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #00FF00)
             )
             (GraphicsLayer
               (position 0.00 200.00)
@@ -51,6 +55,8 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint:
           (position 100.00 230.00)
           (bounds 300.00 300.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #D3D3D3)
         )
         (GraphicsLayer
           (children 2
@@ -58,6 +64,8 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint:
               (position 0.00 200.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #00FFFF)
             )
             (GraphicsLayer
               (position 0.00 300.00)
@@ -83,6 +91,8 @@ CASE 3, scrolling y to 120, no repaints expected:
           (position 100.00 270.00)
           (bounds 300.00 300.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #D3D3D3)
         )
         (GraphicsLayer
           (children 2
@@ -90,6 +100,8 @@ CASE 3, scrolling y to 120, no repaints expected:
               (position 0.00 200.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #00FFFF)
             )
             (GraphicsLayer
               (position 0.00 300.00)
@@ -119,6 +131,8 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint:
           (position 100.00 320.00)
           (bounds 300.00 300.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #D3D3D3)
         )
         (GraphicsLayer
           (children 2
@@ -126,6 +140,8 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint:
               (position 0.00 300.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #00FF00)
             )
             (GraphicsLayer
               (position 0.00 400.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
index 68d9810..6651a7b 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
@@ -12,10 +12,14 @@ CASE 1, original layer tree:
         (GraphicsLayer
           (bounds 400.00 200.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (children 1
             (GraphicsLayer
               (bounds 50.00 50.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #FF0000)
             )
           )
         )
@@ -23,6 +27,8 @@ CASE 1, original layer tree:
           (position 100.00 50.00)
           (bounds 200.00 4000.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #00FFFF)
         )
       )
     )
@@ -41,10 +47,14 @@ CASE 2, scrolling y to 80, the "container" element should remain positioned with
           (position 0.00 80.00)
           (bounds 400.00 200.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (children 1
             (GraphicsLayer
               (bounds 50.00 50.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #FF0000)
             )
           )
         )
@@ -52,6 +62,8 @@ CASE 2, scrolling y to 80, the "container" element should remain positioned with
           (position 100.00 50.00)
           (bounds 200.00 4000.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #00FFFF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
index b6558d7..e107ac3 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
@@ -14,21 +14,29 @@ CASE 1, original layer tree:
         (GraphicsLayer
           (bounds 400.00 400.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 100.00 100.00)
           (bounds 100.00 4000.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (children 2
             (GraphicsLayer
               (position 0.00 50.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 100.00 0.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #00FF00)
             )
           )
         )
@@ -49,21 +57,29 @@ CASE 2, scrolling y by 10 pixels, both the "container" and "inner" should scroll
           (position 0.00 10.00)
           (bounds 400.00 400.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 100.00 100.00)
           (bounds 100.00 4000.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
           (children 2
             (GraphicsLayer
               (position 0.00 60.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 100.00 0.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #00FF00)
             )
           )
         )
@@ -84,17 +100,23 @@ CASE 3, scrolling y further so that "inner" no longer overlaps the fixed-pos lay
           (position 0.00 110.00)
           (bounds 400.00 400.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 100.00 100.00)
           (bounds 200.00 4000.00)
           (drawsContent 1)
           (backgroundColor #008000)
+          (repaint rects
+          )
           (children 1
             (GraphicsLayer
               (position 0.00 160.00)
               (bounds 200.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
           )
         )
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-animated-gif-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-animated-gif-expected.txt
index 86bf26b..ff6032c 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-animated-gif-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-animated-gif-expected.txt
@@ -14,6 +14,8 @@ Repaint rect of the animated gif:
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 180.00 180.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-compositing-hover-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-compositing-hover-expected.txt
index 93618cb..2cbadac 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-compositing-hover-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-compositing-hover-expected.txt
@@ -19,6 +19,8 @@ Case 1, original layer tree:
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 180.00 180.00)
@@ -48,6 +50,8 @@ Case 2: hovering over the "middle" element (causes that div to become its own co
           (position 100.00 100.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
         (GraphicsLayer
           (children 2
@@ -55,6 +59,8 @@ Case 2: hovering over the "middle" element (causes that div to become its own co
               (position 180.00 180.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
             (GraphicsLayer
               (position 260.00 260.00)
@@ -86,6 +92,8 @@ Case 3: hovering over the "middle2" element (causes that div to become its own c
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 180.00 180.00)
@@ -100,6 +108,8 @@ Case 3: hovering over the "middle2" element (causes that div to become its own c
               (position 260.00 260.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
             (GraphicsLayer
               (position 340.00 340.00)
@@ -131,6 +141,8 @@ Case 4: hovering over the "top" element (causes that div to become its own compo
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 180.00 180.00)
@@ -143,6 +155,8 @@ Case 4: hovering over the "top" element (causes that div to become its own compo
           (position 340.00 340.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
@@ -167,6 +181,8 @@ Case 5: back to situation in case 1
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 180.00 180.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-nephew-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-nephew-expected.txt
index 809ba02..ba1f35f 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-nephew-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-nephew-expected.txt
@@ -21,6 +21,8 @@
                       (position 100.00 100.00)
                       (bounds 100.00 100.00)
                       (contentsOpaque 1)
+                      (drawsContent 1)
+                      (backgroundColor #0000FF)
                     )
                     (GraphicsLayer
                       (bounds 300.00 300.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-transform-backing-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-transform-backing-expected.txt
index bfef320..c667b27 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-transform-backing-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-onto-transform-backing-expected.txt
@@ -12,6 +12,8 @@
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
               (transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
             )
             (GraphicsLayer
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-simple-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-simple-expected.txt
index c5662d4..f6be6b6 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-simple-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-simple-expected.txt
@@ -12,6 +12,8 @@
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 20.00 20.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-three-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-three-layers-expected.txt
index fe82752..60ac7e1 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-three-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-three-layers-expected.txt
@@ -12,6 +12,8 @@
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 40.00 40.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-expected.txt
index ad30103..b70e298 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-expected.txt
@@ -12,6 +12,8 @@
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position -1.00 -1.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
index b99c267..caf2a38 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
@@ -13,6 +13,8 @@ CASE 1, original layer tree
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position -1.00 -1.00)
@@ -40,6 +42,8 @@ CASE 2, hovering over the outer div
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position -1.00 -1.00)
@@ -72,6 +76,8 @@ CASE 3, hovering over the inner div
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position -1.00 -1.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
index d8a6e0d..97a0a78 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
@@ -13,6 +13,8 @@ CASE 1, original layer tree
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 5.00 5.00)
@@ -40,6 +42,8 @@ CASE 2, hovering over the outer div
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 5.00 5.00)
@@ -72,6 +76,8 @@ CASE 3, hovering over the inner div
               (position 100.00 100.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
             )
             (GraphicsLayer
               (position 5.00 5.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
index 29d6a4b..076cb71 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
@@ -15,6 +15,8 @@ CASE 1, original layer tree:
               (position 60.00 60.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squashed-repaints-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squashed-repaints-expected.txt
index c6ed227..0bab854 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squashed-repaints-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squashed-repaints-expected.txt
@@ -15,6 +15,8 @@ CASE 1, original layer tree:
               (position 60.00 60.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -42,6 +44,8 @@ CASE 2, overlap1 changes color:
               (position 60.00 60.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -74,6 +78,8 @@ CASE 3, overlap1 and overlap2 change color:
               (position 60.00 60.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -109,6 +115,8 @@ CASE 4, overlap2 and overlap3 change color:
               (position 60.00 60.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
@@ -144,6 +152,8 @@ CASE 5, overlap3 and overlap1 change color:
               (position 60.00 60.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #808080)
             )
             (GraphicsLayer
               (position 140.00 140.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/tiled-layers-hidpi-expected.txt b/third_party/WebKit/LayoutTests/compositing/tiled-layers-hidpi-expected.txt
index 51c9926..39678d1 100644
--- a/third_party/WebKit/LayoutTests/compositing/tiled-layers-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/tiled-layers-hidpi-expected.txt
@@ -10,6 +10,8 @@
           (position 8.00 8.00)
           (bounds 1800.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt
index c3e4e43..fdc8cb0 100644
--- a/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/transitions/transitions-have-composited-layers-expected.txt
@@ -10,16 +10,22 @@
           (position 60.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 120.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 180.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/will-change/composited-layers-expected.txt b/third_party/WebKit/LayoutTests/compositing/will-change/composited-layers-expected.txt
index 4caf3b3..8860731 100644
--- a/third_party/WebKit/LayoutTests/compositing/will-change/composited-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/will-change/composited-layers-expected.txt
@@ -10,41 +10,57 @@
           (position 60.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 120.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 180.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 240.00 0.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 0.00 60.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 60.00 60.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 120.00 60.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 180.00 60.00)
           (bounds 50.00 50.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-layers-expected.txt b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-layers-expected.txt
index a27916f..48e1e9f 100644
--- a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-layers-expected.txt
@@ -15,10 +15,14 @@
               (bounds 10.00 10.00)
               (blendMode multiply)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #0000FF)
               (children 1
                 (GraphicsLayer
                   (bounds 10.00 10.00)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #FFFF00)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-reason-children-expected.txt b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-reason-children-expected.txt
index 53fb34f..63d5752 100644
--- a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-reason-children-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-composited-reason-children-expected.txt
@@ -12,11 +12,15 @@
             (GraphicsLayer
               (position 8.00 8.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #FF0000)
               (children 2
                 (GraphicsLayer
                   (bounds 160.00 90.00)
                   (isolate 1)
                   (contentsOpaque 1)
+                  (drawsContent 1)
+                  (backgroundColor #008000)
                   (children 1
                     (GraphicsLayer
                       (bounds 160.00 90.00)
@@ -33,6 +37,7 @@
                   )
                 )
                 (GraphicsLayer
+                  (drawsContent 1)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-2-stacking-contexts-expected.txt b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-2-stacking-contexts-expected.txt
index 1f58003..bfe2d8e 100644
--- a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-2-stacking-contexts-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-2-stacking-contexts-expected.txt
@@ -12,6 +12,8 @@
             (GraphicsLayer
               (position 8.00 8.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #FF0000)
               (children 2
                 (GraphicsLayer
                   (bounds 160.00 90.00)
@@ -27,12 +29,15 @@
                   )
                 )
                 (GraphicsLayer
+                  (drawsContent 1)
                 )
               )
             )
             (GraphicsLayer
               (position 8.00 8.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #FF0000)
               (children 2
                 (GraphicsLayer
                   (bounds 160.00 90.00)
@@ -48,6 +53,7 @@
                   )
                 )
                 (GraphicsLayer
+                  (drawsContent 1)
                 )
               )
             )
diff --git a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-remove-expected.txt b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-remove-expected.txt
index 68babb7..9fb420a 100644
--- a/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-remove-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/compositing/mix-blend-mode-isolation-remove-expected.txt
@@ -11,6 +11,8 @@
           (bounds 784.00 90.00)
           (isolate 1)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (children 2
             (GraphicsLayer
               (bounds 784.00 90.00)
diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt
index a41be19..286b08b 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change-expected.txt
@@ -17,6 +17,8 @@
               (position 50.00 50.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
           )
         )
@@ -43,6 +45,8 @@
               (position 50.00 50.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #008000)
             )
           )
         )
diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt
index 0333d00..e3b63bd 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt
@@ -10,6 +10,8 @@
           (position 250.00 250.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
@@ -27,6 +29,8 @@
           (position 250.00 250.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
         (GraphicsLayer
           (position 100.00 100.00)
diff --git a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt
index 0333d00..e3b63bd 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt
@@ -10,6 +10,8 @@
           (position 250.00 250.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
@@ -27,6 +29,8 @@
           (position 250.00 250.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
         (GraphicsLayer
           (position 100.00 100.00)
diff --git a/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt
index a8cd3c6a..e61bbd5 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt
@@ -15,6 +15,8 @@
               (position 22.00 22.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #FF0000)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt
index 94da5af..3546f2d 100644
--- a/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 85.00 85.00)
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt
index 949c8fe..1c6c904 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt
@@ -10,11 +10,15 @@
           (position 100.00 3100.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 100.00 3100.00)
           (bounds 200.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
index 49f81ae..0b3423e 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
@@ -15,6 +15,8 @@ middle
           (position 129.00 29.00)
           (bounds 200.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 8.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt
index 2b2cf51..334adeb 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 150.00 150.00)
+          (drawsContent 1)
+          (backgroundColor #00000099)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt
index b6fc52e..1e313ae 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt
index c51a80b..82fefba 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt
@@ -33,6 +33,8 @@ When the parent document becomes composited, the layer trees should get connecte
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -55,6 +57,8 @@ When the parent document becomes composited, the layer trees should get connecte
           (position 8.00 8.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt
index ebf39e8..6342514 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt
index 3b734f1..032cf17 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-resize-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt
index 187b2e2..b7f10c5 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt
index 2b3ebb6..8400aaa 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
@@ -52,6 +54,8 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
+          (drawsContent 1)
+          (backgroundColor #00000033)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt
index 7007209..436739b 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/iframes/resizer-expected.txt
@@ -31,6 +31,8 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #0000FF)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt
index 48aece5..414e635 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/animation-overlap-with-children-expected.txt
@@ -17,6 +17,8 @@ Should be composited
               (position 6.00 6.00)
               (bounds 250.00 50.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #C0C0C0)
             )
             (GraphicsLayer
               (position 11.00 21.00)
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-expected.txt
index 7cc3d55..2fffe86 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-expected.txt
@@ -12,6 +12,8 @@
             (GraphicsLayer
               (bounds 10.00 10.00)
               (contentsOpaque 1)
+              (drawsContent 1)
+              (backgroundColor #C0C0C0)
             )
             (GraphicsLayer
               (bounds 785.00 1021.00)
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
index 13db892..fc5d8a2 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
@@ -11,10 +11,14 @@ Not scaled:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -33,20 +37,28 @@ Scale=0.5:
           (position 8.00 1008.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 1000.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -64,6 +76,8 @@ Scale=1.5:
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
index f188565..fc414fb 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
@@ -11,11 +11,15 @@ Not scaled:
           (position 600.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 0.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -34,20 +38,28 @@ Scale=0.5:
           (position 8.00 1008.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 1000.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
@@ -65,6 +77,8 @@ Scale=1.5:
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #C0C0C0)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
index dab8191..9c866b9 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
@@ -149,21 +149,29 @@ After:
           (position 8.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 208.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 8.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
         (GraphicsLayer
           (position 208.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #808080)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow-trumps-transform-style-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow-trumps-transform-style-expected.txt
index 7190fee..f5ffc5b 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow-trumps-transform-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow-trumps-transform-style-expected.txt
@@ -14,12 +14,16 @@ flat
           (contentsOpaque 1)
           (shouldFlattenTransform 0)
           (3dRenderingContext 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
         )
         (GraphicsLayer
           (position 18.00 120.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
         )
       )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt
index ca49d15..8366085f 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,6 +29,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -47,6 +49,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
@@ -76,12 +79,14 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 100.00)
               (children 1
                 (GraphicsLayer
                   (bounds 10.00 10.00)
+                  (drawsContent 1)
                   (children 1
                     (GraphicsLayer
                     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt
index ca49d15..8366085f 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,6 +29,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -47,6 +49,7 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
@@ -76,12 +79,14 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 100.00)
               (children 1
                 (GraphicsLayer
                   (bounds 10.00 10.00)
+                  (drawsContent 1)
                   (children 1
                     (GraphicsLayer
                     )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt
index 94da5af..3546f2d 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/overflow/resize-painting-expected.txt
@@ -9,6 +9,7 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 100.00 100.00)
+          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 85.00 85.00)
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt
index 9a3d694..6e6b538 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-expected.txt
@@ -29,6 +29,8 @@
                                   (position 665.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
index 71f3d8c..c931cdc 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt
@@ -29,6 +29,8 @@
                                   (position 51.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt
index 9a3d694..6e6b538 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-expected.txt
@@ -29,6 +29,8 @@
                                   (position 665.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
index 9a3d694..6e6b538 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt
@@ -29,6 +29,8 @@
                                   (position 665.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
+                                  (drawsContent 1)
+                                  (backgroundColor #008000)
                                 )
                               )
                             )
diff --git a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/tiled-layers-hidpi-expected.txt b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/tiled-layers-hidpi-expected.txt
index 51c9926..39678d1 100644
--- a/third_party/WebKit/LayoutTests/virtual/softwarecompositing/tiled-layers-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/softwarecompositing/tiled-layers-hidpi-expected.txt
@@ -10,6 +10,8 @@
           (position 8.00 8.00)
           (bounds 1800.00 10.00)
           (contentsOpaque 1)
+          (drawsContent 1)
+          (backgroundColor #0000FF)
         )
       )
     )
diff --git a/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.cpp
index 090f703..40ac4cc 100644
--- a/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.cpp
@@ -346,7 +346,7 @@ void CompositedLayerMapping::updateCompositedBounds()
 {
     // We need to know if we draw content in order to update our bounds (this has an effect
     // on whether or not descendands will paint into our backing). Update this value now.
-    updateDrawsContent(isSimpleContainerCompositingLayer());
+    updateDrawsContent();
 
     LayoutRect layerBounds = compositor()->calculateCompositedBounds(m_owningLayer, m_owningLayer);
 
@@ -514,7 +514,7 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
         m_graphicsLayer->setReplicatedByLayer(0);
     }
 
-    updateBackgroundColor(isSimpleContainerCompositingLayer());
+    updateBackgroundColor();
 
     if (isDirectlyCompositedImage())
         updateImageContents();
@@ -632,8 +632,6 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry()
     if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyOpacity))
         updateOpacity(renderer()->style());
 
-    bool isSimpleContainer = isSimpleContainerCompositingLayer();
-
     m_owningLayer->updateDescendantDependentFlags();
 
     // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer and its non-compositing
@@ -851,9 +849,9 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry()
         updateIsRootForIsolatedGroup();
     }
 
-    updateContentsRect(isSimpleContainer);
-    updateBackgroundColor(isSimpleContainer);
-    updateDrawsContent(isSimpleContainer);
+    updateContentsRect();
+    updateBackgroundColor();
+    updateDrawsContent();
     updateContentsOpaque();
     updateAfterWidgetResize();
     updateRenderingContext();
@@ -938,18 +936,12 @@ void CompositedLayerMapping::updateInternalHierarchy()
     }
 }
 
-void CompositedLayerMapping::updateContentsRect(bool isSimpleContainer)
+void CompositedLayerMapping::updateContentsRect()
 {
-    LayoutRect contentsRect;
-    if (isSimpleContainer && renderer()->hasBackground())
-        contentsRect = backgroundBox();
-    else
-        contentsRect = contentsBox();
-
-    m_graphicsLayer->setContentsRect(pixelSnappedIntRect(contentsRect));
+    m_graphicsLayer->setContentsRect(pixelSnappedIntRect(contentsBox()));
 }
 
-void CompositedLayerMapping::updateDrawsContent(bool isSimpleContainer)
+void CompositedLayerMapping::updateDrawsContent()
 {
     if (m_scrollingLayer) {
         // We don't have to consider overflow controls, because we know that the scrollbars are drawn elsewhere.
@@ -964,7 +956,7 @@ void CompositedLayerMapping::updateDrawsContent(bool isSimpleContainer)
         return;
     }
 
-    bool hasPaintedContent = containsPaintedContent(isSimpleContainer);
+    bool hasPaintedContent = containsPaintedContent();
     if (hasPaintedContent && isAcceleratedCanvas(renderer())) {
         CanvasRenderingContext* context = toHTMLCanvasElement(renderer()->node())->renderingContext();
         // Content layer may be null if context is lost.
@@ -1498,45 +1490,9 @@ Color CompositedLayerMapping::rendererBackgroundColor() const
     return backgroundRenderer->resolveColor(CSSPropertyBackgroundColor);
 }
 
-void CompositedLayerMapping::updateBackgroundColor(bool isSimpleContainer)
-{
-    Color backgroundColor = rendererBackgroundColor();
-    if (isSimpleContainer) {
-        m_graphicsLayer->setContentsToSolidColor(backgroundColor);
-        m_graphicsLayer->setBackgroundColor(Color::transparent);
-    } else {
-        m_graphicsLayer->setContentsToSolidColor(Color::transparent);
-        m_graphicsLayer->setBackgroundColor(backgroundColor);
-    }
-}
-
-static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer)
+void CompositedLayerMapping::updateBackgroundColor()
 {
-    if (renderer->hasClip())
-        return false;
-
-    if (hasBoxDecorationsOrBackgroundImage(renderer->style()))
-        return false;
-
-    // FIXME: we should be able to allow backgroundComposite; However since this is not a common use case it has been deferred for now.
-    if (renderer->style()->backgroundComposite() != CompositeSourceOver)
-        return false;
-
-    if (renderer->style()->backgroundClip() == TextFillBox)
-        return false;
-
-    return true;
-}
-
-bool CompositedLayerMapping::paintsBoxDecorations() const
-{
-    if (!m_owningLayer->hasVisibleBoxDecorations())
-        return false;
-
-    if (!supportsDirectBoxDecorationsComposition(renderer()))
-        return true;
-
-    return false;
+    m_graphicsLayer->setBackgroundColor(rendererBackgroundColor());
 }
 
 bool CompositedLayerMapping::paintsChildren() const
@@ -1555,52 +1511,6 @@ static bool isCompositedPlugin(RenderObject* renderer)
     return renderer->isEmbeddedObject() && toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing();
 }
 
-// A "simple container layer" is a RenderLayer which has no visible content to render.
-// It may have no children, or all its children may be themselves composited.
-// This is a useful optimization, because it allows us to avoid allocating backing store.
-bool CompositedLayerMapping::isSimpleContainerCompositingLayer() const
-{
-    RenderObject* renderObject = renderer();
-    if (renderObject->hasMask()) // masks require special treatment
-        return false;
-
-    if (renderObject->isReplaced() && !isCompositedPlugin(renderObject))
-        return false;
-
-    if (paintsBoxDecorations() || paintsChildren())
-        return false;
-
-    if (renderObject->isRenderRegion())
-        return false;
-
-    if (renderObject->node() && renderObject->node()->isDocumentNode()) {
-        // Look to see if the root object has a non-simple background
-        RenderObject* rootObject = renderObject->document().documentElement() ? renderObject->document().documentElement()->renderer() : 0;
-        if (!rootObject)
-            return false;
-
-        RenderStyle* style = rootObject->style();
-
-        // Reject anything that has a border, a border-radius or outline,
-        // or is not a simple background (no background, or solid color).
-        if (hasBoxDecorationsOrBackgroundImage(style))
-            return false;
-
-        // Now look at the body's renderer.
-        HTMLElement* body = renderObject->document().body();
-        RenderObject* bodyObject = (body && body->hasLocalName(bodyTag)) ? body->renderer() : 0;
-        if (!bodyObject)
-            return false;
-
-        style = bodyObject->style();
-
-        if (hasBoxDecorationsOrBackgroundImage(style))
-            return false;
-    }
-
-    return true;
-}
-
 static bool hasVisibleNonCompositingDescendant(RenderLayer* parent)
 {
     // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512.
@@ -1640,20 +1550,54 @@ bool CompositedLayerMapping::hasVisibleNonCompositingDescendantLayers() const
     return hasVisibleNonCompositingDescendant(m_owningLayer);
 }
 
-bool CompositedLayerMapping::containsPaintedContent(bool isSimpleContainer) const
+bool CompositedLayerMapping::containsPaintedContent() const
 {
-    if (isSimpleContainer || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
+    if (paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
         return false;
 
     if (isDirectlyCompositedImage())
         return false;
 
+    RenderObject* renderObject = renderer();
     // FIXME: we could optimize cases where the image, video or canvas is known to fill the border box entirely,
     // and set background color on the layer in that case, instead of allocating backing store and painting.
-    if (renderer()->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo())
+    if (renderObject->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo())
         return m_owningLayer->hasBoxDecorationsOrBackground();
 
-    return true;
+    if (m_owningLayer->hasVisibleBoxDecorations())
+        return true;
+
+    if (renderObject->hasMask()) // masks require special treatment
+        return true;
+
+    if (renderObject->isReplaced() && !isCompositedPlugin(renderObject))
+        return true;
+
+    if (renderObject->isRenderRegion())
+        return true;
+
+    if (renderObject->node() && renderObject->node()->isDocumentNode() && renderObject->document().documentElement()) {
+        // Look to see if the root object has a non-simple background
+        RenderObject* rootObject = renderObject->document().documentElement()->renderer();
+        RenderStyle* style = rootObject->style();
+
+        // Reject anything that has a border, a border-radius or outline,
+        // or is not a simple background (no background, or solid color).
+        if (hasBoxDecorationsOrBackgroundImage(style))
+            return true;
+
+        // Now look at the body's renderer.
+        HTMLElement* body = renderObject->document().body();
+        RenderObject* bodyObject = (body && body->hasLocalName(bodyTag)) ? body->renderer() : 0;
+        if (bodyObject) {
+            style = bodyObject->style();
+            if (hasBoxDecorationsOrBackgroundImage(style))
+                return true;
+        }
+    }
+
+    // FIXME: it's O(n^2). A better solution is needed.
+    return paintsChildren();
 }
 
 // An image can be directly compositing if it's the sole content of the layer, and has no box decorations
@@ -1709,8 +1653,7 @@ void CompositedLayerMapping::updateImageContents()
 
     // This is a no-op if the layer doesn't have an inner layer for the image.
     m_graphicsLayer->setContentsToImage(image);
-    bool isSimpleContainer = false;
-    updateDrawsContent(isSimpleContainer);
+    updateDrawsContent();
 
     // Image animation is "lazy", in that it automatically stops unless someone is drawing
     // the image. So we have to kick the animation each time; this has the downside that the
@@ -1757,13 +1700,6 @@ LayoutRect CompositedLayerMapping::contentsBox() const
     return contentsBox;
 }
 
-IntRect CompositedLayerMapping::backgroundBox() const
-{
-    LayoutRect backgroundBox = backgroundRect(renderer());
-    backgroundBox.move(contentOffsetInCompostingLayer());
-    return pixelSnappedIntRect(backgroundBox);
-}
-
 GraphicsLayer* CompositedLayerMapping::parentForSublayers() const
 {
     if (m_scrollingContentsLayer)
diff --git a/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.h b/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.h
index 933a6cd..0465672 100644
--- a/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.h
+++ b/third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.h
@@ -184,7 +184,6 @@ public:
 #endif
 
     LayoutRect contentsBox() const;
-    IntRect backgroundBox() const;
 
     GraphicsLayer* layerForHorizontalScrollbar() const { return m_layerForHorizontalScrollbar.get(); }
     GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }
@@ -223,7 +222,7 @@ private:
     void updateScrollParent(RenderLayer*);
     void updateClipParent(RenderLayer*);
     bool updateSquashingLayers(bool needsSquashingLayers);
-    void updateDrawsContent(bool isSimpleContainer);
+    void updateDrawsContent();
     void updateChildrenTransform();
     void registerScrollingLayers();
 
@@ -250,20 +249,17 @@ private:
 
     bool isMainFrameRenderViewLayer() const;
 
-    bool paintsBoxDecorations() const;
     bool paintsChildren() const;
 
-    // Returns true if this compositing layer has no visible content.
-    bool isSimpleContainerCompositingLayer() const;
     // Returns true if this layer has content that needs to be rendered by painting into the backing store.
-    bool containsPaintedContent(bool isSimpleContainer) const;
+    bool containsPaintedContent() const;
     // Returns true if the RenderLayer just contains an image that we can composite directly.
     bool isDirectlyCompositedImage() const;
     void updateImageContents();
 
     Color rendererBackgroundColor() const;
-    void updateBackgroundColor(bool isSimpleContainer);
-    void updateContentsRect(bool isSimpleContainer);
+    void updateBackgroundColor();
+    void updateContentsRect();
 
     void updateCompositingReasons();
 
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
index 501b806..0a8f3ea 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
@@ -99,7 +99,6 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
     , m_replicaLayer(0)
     , m_replicatedLayer(0)
     , m_paintCount(0)
-    , m_contentsSolidColor(Color::transparent)
     , m_contentsLayer(0)
     , m_contentsLayerId(0)
     , m_scrollableArea(0)
@@ -1019,27 +1018,6 @@ void GraphicsLayer::setContentsToNinePatch(Image* image, const IntRect& aperture
     setContentsTo(m_ninePatchLayer ? m_ninePatchLayer->layer() : 0);
 }
 
-void GraphicsLayer::setContentsToSolidColor(const Color& color)
-{
-    if (color == m_contentsSolidColor)
-        return;
-
-    m_contentsSolidColor = color;
-    if (color.alpha()) {
-        if (!m_solidColorLayer) {
-            m_solidColorLayer = adoptPtr(Platform::current()->compositorSupport()->createSolidColorLayer());
-            registerContentsLayer(m_solidColorLayer->layer());
-        }
-        m_solidColorLayer->setBackgroundColor(color.rgb());
-    } else {
-        if (!m_solidColorLayer)
-            return;
-        unregisterContentsLayer(m_solidColorLayer->layer());
-        m_solidColorLayer.clear();
-    }
-    setContentsTo(m_solidColorLayer ? m_solidColorLayer->layer() : 0);
-}
-
 bool GraphicsLayer::addAnimation(PassOwnPtr<WebAnimation> popAnimation)
 {
     OwnPtr<WebAnimation> animation(popAnimation);
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
index 0bb507d..1e2273e 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
@@ -232,7 +232,6 @@ public:
     // Layer contents
     void setContentsToImage(Image*);
     void setContentsToNinePatch(Image*, const IntRect& aperture);
-    void setContentsToSolidColor(const Color&);
     void setContentsToPlatformLayer(blink::WebLayer* layer) { setContentsTo(layer); }
     bool hasContentsLayer() const { return m_contentsLayer; }
 
@@ -382,8 +381,6 @@ private:
     OwnPtr<blink::WebContentLayer> m_layer;
     OwnPtr<blink::WebImageLayer> m_imageLayer;
     OwnPtr<blink::WebNinePatchLayer> m_ninePatchLayer;
-    Color m_contentsSolidColor;
-    OwnPtr<blink::WebSolidColorLayer> m_solidColorLayer;
     blink::WebLayer* m_contentsLayer;
     // We don't have ownership of m_contentsLayer, but we do want to know if a given layer is the
     // same as our current layer in setContentsTo(). Since m_contentsLayer may be deleted at this point,
diff --git a/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp b/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp
index 5ae5a78..29b7e11 100644
--- a/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp
@@ -165,16 +165,4 @@ TEST_F(GraphicsLayerTest, applyScrollToScrollableArea)
     EXPECT_EQ(scrollPosition, WebPoint(scrollableArea.scrollPosition()));
 }
 
-TEST_F(GraphicsLayerTest, DISABLED_setContentsToSolidColor)
-{
-    m_graphicsLayer->setContentsToSolidColor(Color::transparent);
-    EXPECT_FALSE(m_graphicsLayer->contentsLayer());
-
-    m_graphicsLayer->setContentsToSolidColor(Color::white);
-    EXPECT_TRUE(m_graphicsLayer->contentsLayer());
-
-    m_graphicsLayer->setContentsToSolidColor(Color());
-    EXPECT_FALSE(m_graphicsLayer->contentsLayer());
-}
-
 } // namespace
diff --git a/third_party/WebKit/public/platform/WebCompositorSupport.h b/third_party/WebKit/public/platform/WebCompositorSupport.h
index 9f33d32..8475c1ec 100644
--- a/third_party/WebKit/public/platform/WebCompositorSupport.h
+++ b/third_party/WebKit/public/platform/WebCompositorSupport.h
@@ -74,6 +74,7 @@ public:
 
     virtual WebNinePatchLayer* createNinePatchLayer() { return 0; }
 
+    // TODO(dshwang): This isn't used anymore.
     virtual WebSolidColorLayer* createSolidColorLayer() { return 0; }
 
     // The ownership of the WebScrollbarThemeGeometry pointer is passed to Chromium.
author	dongseong.hwang@intel.com <dongseong.hwang@intel.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>	2014-03-01 14:44:48 +0000
committer	dongseong.hwang@intel.com <dongseong.hwang@intel.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>	2014-03-01 14:44:48 +0000
commit	8580eba80e6560829b349dfb4f23c35fc9958bdc (patch)
tree	85301553604aa79af64a3920cb12d2035fe8d6ed /third_party
parent	4909dead01a48ddf024e1e4bef0d0a2ad79d161c (diff)
download	chromium_src-8580eba80e6560829b349dfb4f23c35fc9958bdc.zip chromium_src-8580eba80e6560829b349dfb4f23c35fc9958bdc.tar.gz chromium_src-8580eba80e6560829b349dfb4f23c35fc9958bdc.tar.bz2