[chromium] Support GraphicsLayer::setContentsToSolidColor
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Mar 2013 23:34:40 +0000 (23:34 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Mar 2013 23:34:40 +0000 (23:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=104396

Reviewed by Adrienne Walker.

Source/WebCore:

This enables and implements the GraphicsLayer::setContentsToSolidColor
path for Chromium.

Tested by reftests in compositing/background-color/ and several other
compositing/ tests.

* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::supportsBackgroundColorContent):
* platform/graphics/chromium/GraphicsLayerChromium.cpp:
(WebCore::GraphicsLayerChromium::setContentsToSolidColor):
(WebCore):
* platform/graphics/chromium/GraphicsLayerChromium.h:
(WebKit):
(GraphicsLayerChromium):

Source/WebKit/chromium:

Updates some unit tests for better include discipline.

* tests/GraphicsLayerChromiumTest.cpp:
* tests/ImageLayerChromiumTest.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

139 files changed:
LayoutTests/compositing/geometry/object-clip-rects-assertion-expected.txt
LayoutTests/compositing/repaint/invalidations-on-composited-layers-expected.txt
LayoutTests/platform/chromium-linux-x86/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt [deleted file]
LayoutTests/platform/chromium-linux-x86/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt [deleted file]
LayoutTests/platform/chromium-linux/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt [deleted file]
LayoutTests/platform/chromium-linux/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt [deleted file]
LayoutTests/platform/chromium-linux/compositing/geometry/fixed-in-composited-expected.png
LayoutTests/platform/chromium-linux/compositing/iframes/become-overlapped-iframe-expected.txt [deleted file]
LayoutTests/platform/chromium-linux/compositing/iframes/composited-parent-iframe-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/connect-compositing-iframe-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/connect-compositing-iframe2-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/connect-compositing-iframe3-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/enter-compositing-iframe-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/iframe-resize-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/iframe-size-from-zero-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/invisible-nested-iframe-show-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/overlapped-iframe-expected.txt
LayoutTests/platform/chromium-linux/compositing/iframes/resizer-expected.txt
LayoutTests/platform/chromium-linux/compositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/compositing/perpendicular-layer-sorting-expected.png
LayoutTests/platform/chromium-linux/platform/chromium/virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-expected.png
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/geometry/video-fixed-scrolling-expected.png
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/become-overlapped-iframe-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/composited-parent-iframe-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe2-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe3-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/enter-compositing-iframe-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/iframe-resize-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/iframe-size-from-zero-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/invisible-nested-iframe-show-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/overlapped-iframe-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/iframes/resizer-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/reflections/animation-inside-reflection-expected.png
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/rtl/rtl-iframe-absolute-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/rtl/rtl-iframe-fixed-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/rtl/rtl-iframe-relative-expected.txt
LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/transitions/scale-transition-no-start-expected.png
LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt [deleted file]
LayoutTests/platform/chromium-mac/platform/chromium/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt [deleted file]
LayoutTests/platform/chromium-win-xp/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt [deleted file]
LayoutTests/platform/chromium-win-xp/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt [deleted file]
LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-expected.txt
LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-clip-overlap-expected.txt
LayoutTests/platform/chromium-win/compositing/backing/no-backing-for-perspective-expected.txt
LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
LayoutTests/platform/chromium-win/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
LayoutTests/platform/chromium-win/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
LayoutTests/platform/chromium-win/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
LayoutTests/platform/chromium-win/compositing/geometry/preserve-3d-switching-expected.txt
LayoutTests/platform/chromium-win/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt
LayoutTests/platform/chromium-win/compositing/layer-creation/scroll-partial-update-expected.txt
LayoutTests/platform/chromium-win/compositing/tiling/crash-reparent-tiled-layer-expected.txt
LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-add-remove-child-expected.txt
LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-expected.txt
LayoutTests/platform/chromium-win/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt
LayoutTests/platform/chromium/TestExpectations
LayoutTests/platform/chromium/compositing/columns/composited-in-paginated-expected.txt
LayoutTests/platform/chromium/compositing/contents-opaque/background-color-expected.txt
LayoutTests/platform/chromium/compositing/contents-opaque/body-background-painted-expected.txt
LayoutTests/platform/chromium/compositing/contents-opaque/body-background-skipped-expected.txt
LayoutTests/platform/chromium/compositing/contents-opaque/layer-opacity-expected.txt
LayoutTests/platform/chromium/compositing/contents-opaque/layer-transform-expected.txt
LayoutTests/platform/chromium/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt
LayoutTests/platform/chromium/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt
LayoutTests/platform/chromium/compositing/geometry/ancestor-overflow-change-expected.txt
LayoutTests/platform/chromium/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt [deleted file]
LayoutTests/platform/chromium/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt [deleted file]
LayoutTests/platform/chromium/compositing/geometry/clip-expected.txt
LayoutTests/platform/chromium/compositing/geometry/clip-inside-expected.txt
LayoutTests/platform/chromium/compositing/geometry/fixed-position-composited-switch-expected.txt
LayoutTests/platform/chromium/compositing/geometry/flipped-writing-mode-expected.txt
LayoutTests/platform/chromium/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
LayoutTests/platform/chromium/compositing/geometry/limit-layer-bounds-positioned-expected.txt
LayoutTests/platform/chromium/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
LayoutTests/platform/chromium/compositing/geometry/limit-layer-bounds-transformed-expected.txt
LayoutTests/platform/chromium/compositing/iframes/become-composited-nested-iframes-expected.txt
LayoutTests/platform/chromium/compositing/iframes/become-overlapped-iframe-expected.txt
LayoutTests/platform/chromium/compositing/iframes/invisible-nested-iframe-hide-expected.txt
LayoutTests/platform/chromium/compositing/iframes/overlapped-iframe-iframe-expected.txt
LayoutTests/platform/chromium/compositing/iframes/overlapped-nested-iframes-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/fixed-position-and-transform-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/fixed-position-out-of-view-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/fixed-position-under-transform-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overflow-scroll-overlap-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-animation-clipping-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-animation-container-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-animation-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-child-layer-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-clipping-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-transformed-3d-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-transformed-layer-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/overlap-transforms-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/spanOverlapsCanvas-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/stacking-context-overlap-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
LayoutTests/platform/chromium/compositing/layer-creation/translatez-overlap-expected.txt
LayoutTests/platform/chromium/compositing/overflow-trumps-transform-style-expected.txt
LayoutTests/platform/chromium/compositing/overflow/clip-descendents-expected.txt
LayoutTests/platform/chromium/compositing/overflow/content-gains-scrollbars-expected.txt
LayoutTests/platform/chromium/compositing/overflow/overflow-scrollbar-layers-expected.txt
LayoutTests/platform/chromium/compositing/overflow/resize-painting-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-absolute-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-absolute-overflow-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-fixed-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-fixed-overflow-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-iframe-absolute-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-iframe-fixed-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-iframe-relative-expected.txt
LayoutTests/platform/chromium/compositing/rtl/rtl-relative-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/content-gains-scrollbars-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-scrollbar-layers-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/resize-painting-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/overflow/content-gains-scrollbars-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/overflow/overflow-scrollbar-layers-expected.txt
LayoutTests/platform/chromium/platform/chromium/virtual/softwarecompositing/overflow/resize-painting-expected.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/GraphicsLayer.h
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp

index 74da4d2..3d9b9b6 100644 (file)
@@ -1,3 +1,7 @@
+argv[0] src ../resources/video.mp4
+argv[1] autoplay false
+argv[2] height 100
+argv[3] width 100
 This testcase should not fire an assertion related to clip rects.
 
 
index 4a56fa3..ea67a3e 100644 (file)
           (position 8.00 42.00)
           (bounds 400.00 400.00)
           (contentsOpaque 1)
-          (drawsContent 1)
-          (repaint rects
-            (rect 0.00 0.00 400.00 400.00)
-            (rect 0.00 0.00 400.00 400.00)
-            (rect 0.00 0.00 400.00 400.00)
-          )
           (children 1
             (GraphicsLayer
               (position 50.00 50.00)
               (bounds 75.00 75.00)
               (contentsOpaque 1)
-              (drawsContent 1)
-              (repaint rects
-                (rect 0.00 0.00 75.00 75.00)
-                (rect 0.00 0.00 75.00 75.00)
-                (rect 0.00 0.00 75.00 75.00)
-              )
             )
           )
         )
diff --git a/LayoutTests/platform/chromium-linux-x86/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/LayoutTests/platform/chromium-linux-x86/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
deleted file mode 100644 (file)
index 582b18e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 10.00 10.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 210.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 10.00 260.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 210.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (position 490.00 110.00)
-              (bounds 100.00 100.00)
-              (contentsOpaque 1)
-              (drawsContent 1)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-linux-x86/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/LayoutTests/platform/chromium-linux-x86/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
deleted file mode 100644 (file)
index 53781ec..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 5
-        (GraphicsLayer
-          (anchor 0.10 0.20)
-          (bounds 500.00 250.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 500.00 250.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (anchor 0.33 0.33)
-          (bounds 150.00 150.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 150.00 150.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 784.00 16.00)
-          (opacity 0.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-linux/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/LayoutTests/platform/chromium-linux/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
deleted file mode 100644 (file)
index 582b18e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 10.00 10.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 210.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 10.00 260.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 210.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (position 490.00 110.00)
-              (bounds 100.00 100.00)
-              (contentsOpaque 1)
-              (drawsContent 1)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-linux/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/LayoutTests/platform/chromium-linux/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
deleted file mode 100644 (file)
index 53781ec..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 5
-        (GraphicsLayer
-          (anchor 0.10 0.20)
-          (bounds 500.00 250.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 500.00 250.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (anchor 0.33 0.33)
-          (bounds 150.00 150.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 150.00 150.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 784.00 16.00)
-          (opacity 0.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-      )
-    )
-  )
-)
-
index e9524f3..7139d9a 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/compositing/geometry/fixed-in-composited-expected.png and b/LayoutTests/platform/chromium-linux/compositing/geometry/fixed-in-composited-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/compositing/iframes/become-overlapped-iframe-expected.txt b/LayoutTests/platform/chromium-linux/compositing/iframes/become-overlapped-iframe-expected.txt
deleted file mode 100644 (file)
index 5cc271f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 58.00 58.00)
-          (bounds 350.00 200.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (position 15.00 15.00)
-              (children 2
-                (GraphicsLayer
-                  (bounds 305.00 170.00)
-                  (children 1
-                    (GraphicsLayer
-                      (children 1
-                        (GraphicsLayer
-                          (bounds 305.00 230.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 305.00 230.00)
-                              (drawsContent 1)
-                              (children 1
-                                (GraphicsLayer
-                                  (position 18.00 10.00)
-                                  (bounds 210.00 210.00)
-                                  (contentsOpaque 1)
-                                  (drawsContent 1)
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-                (GraphicsLayer
-                  (position 305.00 0.00)
-                  (bounds 15.00 170.00)
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 5.00 5.00)
-          (bounds 150.00 150.00)
-          (drawsContent 1)
-        )
-      )
-    )
-  )
-)
-
index 38cc114..08e71af 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 376911e..24584a2 100644 (file)
@@ -32,7 +32,6 @@ 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)
                                 )
                               )
                             )
@@ -54,7 +53,6 @@ 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)
         )
       )
     )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 90057a7..3eeb663 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index a6cd44f..1760cc8 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index edc4f9e..fdc6713 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 852e5fa..a3ba25f 100644 (file)
@@ -49,7 +49,6 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
-                                                          (drawsContent 1)
                                                         )
                                                       )
                                                     )
@@ -83,7 +82,6 @@
           (position 18.00 203.00)
           (bounds 210.00 210.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (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])
         )
       )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 37e83f7..5937446 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 4226815..e8bdbf3 100644 (file)
@@ -25,7 +25,6 @@
                     (GraphicsLayer
                       (bounds 200.00 150.00)
                       (contentsOpaque 1)
-                      (drawsContent 1)
                     )
                   )
                 )
index c8e7ffd..5ed798c 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/platform/chromium/compositing/perpendicular-layer-sorting-expected.png and b/LayoutTests/platform/chromium-linux/platform/chromium/compositing/perpendicular-layer-sorting-expected.png differ
index d2b0404..0d66437 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-expected.png and b/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep-expected.png differ
index bb7a948..5ec4bec 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/geometry/video-fixed-scrolling-expected.png and b/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/geometry/video-fixed-scrolling-expected.png differ
index 5cc271f..b19760d 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 150.00 150.00)
-          (drawsContent 1)
         )
       )
     )
index 38cc114..08e71af 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 376911e..24584a2 100644 (file)
@@ -32,7 +32,6 @@ 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)
                                 )
                               )
                             )
@@ -54,7 +53,6 @@ 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)
         )
       )
     )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 90057a7..3eeb663 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index a6cd44f..1760cc8 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index edc4f9e..fdc6713 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 852e5fa..a3ba25f 100644 (file)
@@ -49,7 +49,6 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
-                                                          (drawsContent 1)
                                                         )
                                                       )
                                                     )
@@ -83,7 +82,6 @@
           (position 18.00 203.00)
           (bounds 210.00 210.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (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])
         )
       )
index 0187f70..6e4935e 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -51,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 50.00 50.00)
-          (drawsContent 1)
         )
       )
     )
index 37e83f7..5937446 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 4226815..e8bdbf3 100644 (file)
@@ -25,7 +25,6 @@
                     (GraphicsLayer
                       (bounds 200.00 150.00)
                       (contentsOpaque 1)
-                      (drawsContent 1)
                     )
                   )
                 )
index a4e5a06..b521322 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/reflections/animation-inside-reflection-expected.png and b/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/reflections/animation-inside-reflection-expected.png differ
index d9f60b9..c9274be 100644 (file)
@@ -27,7 +27,6 @@
                                   (position 50.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index d9f60b9..c9274be 100644 (file)
@@ -27,7 +27,6 @@
                                   (position 50.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index a402118..1bd6836 100644 (file)
@@ -27,7 +27,6 @@
                                   (position 242.00 58.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index d07890a..73dde11 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/transitions/scale-transition-no-start-expected.png and b/LayoutTests/platform/chromium-linux/platform/chromium/virtual/softwarecompositing/transitions/scale-transition-no-start-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt b/LayoutTests/platform/chromium-mac/compositing/repaint/invalidations-on-composited-layers-expected.txt
deleted file mode 100644 (file)
index 633d707..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-(repaint rects
-  (rect 8 13 784 15)
-  (rect 8 413 784 28)
-  (rect 0 421 800 28)
-)
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 41.00)
-          (bounds 400.00 400.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-          (repaint rects
-            (rect 0.00 0.00 400.00 400.00)
-            (rect 0.00 0.00 400.00 400.00)
-            (rect 0.00 0.00 400.00 400.00)
-          )
-          (children 1
-            (GraphicsLayer
-              (position 50.00 50.00)
-              (bounds 75.00 75.00)
-              (contentsOpaque 1)
-              (drawsContent 1)
-              (repaint rects
-                (rect 0.00 0.00 75.00 75.00)
-                (rect 0.00 0.00 75.00 75.00)
-                (rect 0.00 0.00 75.00 75.00)
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-mac/platform/chromium/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt b/LayoutTests/platform/chromium-mac/platform/chromium/virtual/softwarecompositing/repaint/invalidations-on-composited-layers-expected.txt
deleted file mode 100644 (file)
index 9200a0b..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-(repaint rects
-  (rect 8 13 784 15)
-  (rect 8 413 784 28)
-  (rect 0 421 800 28)
-)
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 41.00)
-          (bounds 400.00 400.00)
-          (drawsContent 1)
-          (repaint rects
-            (rect 0.00 0.00 400.00 400.00)
-            (rect 0.00 0.00 400.00 400.00)
-            (rect 0.00 0.00 400.00 400.00)
-          )
-          (children 1
-            (GraphicsLayer
-              (position 50.00 50.00)
-              (bounds 75.00 75.00)
-              (drawsContent 1)
-              (repaint rects
-                (rect 0.00 0.00 75.00 75.00)
-                (rect 0.00 0.00 75.00 75.00)
-                (rect 0.00 0.00 75.00 75.00)
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-win-xp/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/LayoutTests/platform/chromium-win-xp/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
deleted file mode 100644 (file)
index 582b18e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 10.00 10.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 210.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 10.00 260.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 210.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (position 490.00 110.00)
-              (bounds 100.00 100.00)
-              (contentsOpaque 1)
-              (drawsContent 1)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-win-xp/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/LayoutTests/platform/chromium-win-xp/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
deleted file mode 100644 (file)
index 53781ec..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 5
-        (GraphicsLayer
-          (anchor 0.10 0.20)
-          (bounds 500.00 250.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 500.00 250.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (anchor 0.33 0.33)
-          (bounds 150.00 150.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 150.00 150.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 784.00 16.00)
-          (opacity 0.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-      )
-    )
-  )
-)
-
index 385ada1..147fb9a 100644 (file)
@@ -27,7 +27,6 @@ This layer should not have backing store.
                           (position 30.00 50.00)
                           (bounds 100.00 100.00)
                           (contentsOpaque 1)
-                          (drawsContent 1)
                         )
                       )
                     )
index 9506b6c..2d2e3bb 100644 (file)
@@ -19,7 +19,6 @@ This layer should have backing store.
                   (position 30.00 50.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
               )
             )
@@ -38,7 +37,6 @@ This layer should have backing store.
                   (position 30.00 50.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
               )
             )
index ec9c3be..ecc2bc1 100644 (file)
@@ -21,7 +21,6 @@ This layer should not have backing store.
                   (position 31.00 51.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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])
                 )
               )
index 582b18e..f46f341 100644 (file)
@@ -23,7 +23,6 @@
               (position 490.00 110.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
index 53781ec..cb8e768 100644 (file)
         (GraphicsLayer
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 250.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index bea0978..6dd34e8 100644 (file)
@@ -20,13 +20,11 @@ Second dump layer tree:
               (position 31.00 41.00)
               (bounds 250.00 220.00)
               (contentsOpaque 1)
-              (drawsContent 1)
               (children 1
                 (GraphicsLayer
                   (position 10.00 10.00)
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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])
                   (children 1
                     (GraphicsLayer
index d799cdf..a4cbc55 100644 (file)
@@ -13,7 +13,6 @@
           (position 21.00 21.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 142.00 142.00)
index 9f7c2a6..cef1bb8 100644 (file)
@@ -19,7 +19,6 @@ The green box appear angled out from the yellow box and embedded in it.
               (opacity 0.80)
               (contentsOpaque 1)
               (preserves3D 1)
-              (drawsContent 1)
               (transform [0.77 -0.56 -0.32 0.00] [0.00 0.50 -0.87 0.00] [0.64 0.66 0.38 0.00] [0.00 0.00 0.00 1.00])
               (children 1
                 (GraphicsLayer
index 01692da..d8cabfc 100644 (file)
@@ -18,7 +18,6 @@ This layer should be composited.
               (position 31.00 51.00)
               (bounds 100.00 100.00)
               (contentsOpaque 1)
-              (drawsContent 1)
               (transform [0.98 0.00 -0.17 0.00] [0.00 1.00 0.00 0.00] [0.17 0.00 0.98 0.00] [0.00 0.00 0.00 1.00])
             )
           )
index a057231..0fed3c1 100644 (file)
@@ -13,7 +13,6 @@ scroll me
         (GraphicsLayer
           (position 10.00 10.00)
           (bounds 400.00 100.00)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 200.00 8.00)
index 8dc2bfc..077d92b 100644 (file)
@@ -17,7 +17,6 @@ From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer.
               (position 51.00 101.00)
               (bounds 200.00 4800.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
index 04c60de..4751693 100644 (file)
@@ -38,7 +38,6 @@ Second (child added):
               (position 51.00 401.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
index 3bdf8a7..c4371ad 100644 (file)
@@ -18,13 +18,11 @@ This is some text
               (position 51.00 101.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (position 51.00 4701.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
index 4ba4717..5492943 100644 (file)
@@ -18,13 +18,11 @@ First (small layer):
               (position 51.00 101.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (position 276.00 201.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
@@ -52,13 +50,11 @@ Second (huge layer):
               (position 51.00 101.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (position 276.00 4701.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
@@ -86,13 +82,11 @@ Third (small layer):
               (position 51.00 101.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (position 276.00 201.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
index ccdd33b..64b6b97 100644 (file)
@@ -3674,6 +3674,57 @@ webkit.org/b/109262 [ Debug SnowLeopard ] fast/table/table-cell-before-after-con
 webkit.org/b/109312 [ Win ] fast/canvas/canvas-drawImage-shadow.html [ Pass Failure ]
 webkit.org/b/109312 [ Win ] platform/chromium/virtual/gpu/fast/canvas/canvas-drawImage-shadow.html [ Pass Failure ]
 
+# May need text rebaselines on win/mac without 'drawsContent 1' on solid color layers
+webkit.org/b/104396 [ Win Mac ] compositing/geometry/bounds-ignores-hidden-composited-descendant.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/geometry/bounds-ignores-hidden-dynamic-negzindex.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/become-overlapped-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/composited-parent-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/connect-compositing-iframe-delayed.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/connect-compositing-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/connect-compositing-iframe2.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/connect-compositing-iframe3.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/enter-compositing-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/iframe-resize.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/iframe-size-from-zero.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/invisible-nested-iframe-show.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/overlapped-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/iframes/resizer.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] compositing/overflow/composited-scrolling-creates-a-stacking-container.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/compositing/perpendicular-layer-sorting.html [ ImageOnlyFailure ]
+webkit.org/b/104396 [ Mac ] compositing/backing/no-backing-for-clip.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/backing/no-backing-for-clip-overlap.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/backing/no-backing-for-perspective.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/geometry/layer-due-to-layer-children-deep-switch.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/geometry/limit-layer-bounds-overflow-root.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/geometry/preserve-3d-switching.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/layer-creation/no-compositing-for-preserve-3d.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/layer-creation/scroll-partial-update.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/tiling/crash-reparent-tiled-layer.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/tiling/huge-layer-add-remove-child.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/tiling/huge-layer-with-layer-children.html [ Failure ]
+webkit.org/b/104396 [ Mac ] compositing/tiling/huge-layer-with-layer-children-resize.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/gpu/compositedscrolling/overflow/composited-scrolling-creates-a-stacking-container.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/geometry/layer-due-to-layer-children-deep.html [ ImageOnlyFailure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/become-overlapped-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/composited-parent-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe-delayed.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe2.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/connect-compositing-iframe3.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/enter-compositing-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/iframe-resize.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/iframe-size-from-zero.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/invisible-nested-iframe-show.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/overlapped-iframe.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/iframes/resizer.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/overflow/composited-scrolling-creates-a-stacking-container.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/reflections/animation-inside-reflection.html [ ImageOnlyFailure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/rtl/rtl-fixed-overflow-scrolled.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/rtl/rtl-iframe-absolute.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/rtl/rtl-iframe-fixed.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/rtl/rtl-iframe-relative.html [ Failure ]
+webkit.org/b/104396 [ Win Mac ] platform/chromium/virtual/softwarecompositing/transitions/scale-transition-no-start.html [ ImageOnlyFailure ]
+
 # ENABLE_ENCRYPTED_MEDIA_V2 is not enabled.
 webkit.org/b/97037 media/encrypted-media/encrypted-media-v2-events.html [ Timeout ]
 webkit.org/b/97037 media/encrypted-media/encrypted-media-v2-syntax.html [ Timeout ]
index 6f6507c..82b4bb4 100644 (file)
@@ -9,7 +9,6 @@
           (position 818.00 145.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 119a1d7..a2de4b7 100644 (file)
         (GraphicsLayer
           (position 8.00 108.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 8.00 208.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 51ceb63..0a45a38 100644 (file)
@@ -14,7 +14,6 @@
               (position 8.00 8.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (bounds 800.00 600.00)
index 1bb0816..8af07c5 100644 (file)
@@ -13,7 +13,6 @@
               (position 8.00 8.00)
               (bounds 200.00 200.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (bounds 800.00 600.00)
index 8241036..833343a 100644 (file)
@@ -10,7 +10,6 @@
           (bounds 100.00 100.00)
           (opacity 0.50)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index cf49864..7d4d7f0 100644 (file)
@@ -9,7 +9,6 @@
           (position 8.00 8.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (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])
         )
       )
index 0446bf5..75f626e 100644 (file)
@@ -14,7 +14,6 @@
         (GraphicsLayer
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 8311e8e..5476e90 100644 (file)
@@ -9,7 +9,6 @@
           (position 105.00 105.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 125.00 125.00)
index ec8f66e..e95c00d 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 6.00 6.00)
           (bounds 104.00 104.00)
-          (drawsContent 1)
           (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/LayoutTests/platform/chromium/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/LayoutTests/platform/chromium/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
deleted file mode 100644 (file)
index 9255322..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 10.00 10.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 208.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 10.00 260.00)
-          (anchor -0.02 -0.05)
-          (bounds 590.00 208.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (position 490.00 108.00)
-              (bounds 100.00 100.00)
-              (contentsOpaque 1)
-              (drawsContent 1)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/LayoutTests/platform/chromium/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
deleted file mode 100644 (file)
index 34448b4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 5
-        (GraphicsLayer
-          (anchor 0.10 0.20)
-          (bounds 500.00 250.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 500.00 250.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (anchor 0.33 0.33)
-          (bounds 150.00 150.00)
-          (drawsContent 1)
-          (children 1
-            (GraphicsLayer
-              (bounds 150.00 150.00)
-              (drawsContent 1)
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 784.00 15.00)
-          (opacity 0.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 0.00 250.00)
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-        )
-      )
-    )
-  )
-)
-
index f06be82..fc9a86c 100644 (file)
@@ -21,7 +21,6 @@ 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)
               (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])
             )
           )
index 2959851..9c1d0a4 100644 (file)
@@ -22,7 +22,6 @@ 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)
               (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])
             )
           )
index 38afbf3..04e4ea8 100644 (file)
@@ -12,7 +12,6 @@ After (should not be empty):
           (position 495.00 30.00)
           (bounds 300.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 3ebc2eb..659bd50 100644 (file)
@@ -9,7 +9,6 @@
           (position 18.00 10.00)
           (bounds 250.00 200.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 35.00 10.00)
index 7d2094c..2197468 100644 (file)
@@ -14,7 +14,6 @@ Text here
           (position 29.00 134.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 113.00)
index bb1f0df..a05ee46 100644 (file)
@@ -14,7 +14,6 @@ Text here
           (position 29.00 29.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 8.00)
index ef86f8e..1a9bc10 100644 (file)
@@ -14,7 +14,6 @@ Text here
           (position 29.00 29.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 8.00)
index cb3342f..ebe2047 100644 (file)
@@ -14,7 +14,6 @@ Text here
           (position 129.00 29.00)
           (bounds 200.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position -971.00 8.00)
index ca3cf4e..22b34ae 100644 (file)
@@ -50,7 +50,6 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
-                                                          (drawsContent 1)
                                                         )
                                                       )
                                                     )
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
-                                                          (drawsContent 1)
                                                         )
                                                       )
                                                     )
         (GraphicsLayer
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index aff079b..b19760d 100644 (file)
@@ -30,7 +30,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
@@ -43,7 +42,6 @@
                 (GraphicsLayer
                   (position 305.00 0.00)
                   (bounds 15.00 170.00)
-                  (drawsContent 1)
                 )
               )
             )
@@ -52,7 +50,6 @@
         (GraphicsLayer
           (position 5.00 5.00)
           (bounds 150.00 150.00)
-          (drawsContent 1)
         )
       )
     )
index fe2f345..f896c4e 100644 (file)
@@ -9,7 +9,6 @@
           (position 18.00 10.00)
           (bounds 210.00 210.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 05f6f7b..add756e 100644 (file)
@@ -28,7 +28,6 @@
                                   (position 18.00 10.00)
                                   (bounds 210.00 210.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 16284e6..49dc3c0 100644 (file)
@@ -50,7 +50,6 @@
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
-                                                          (drawsContent 1)
                                                         )
                                                       )
                                                     )
                                                           (position 18.00 10.00)
                                                           (bounds 210.00 210.00)
                                                           (contentsOpaque 1)
-                                                          (drawsContent 1)
                                                         )
                                                       )
                                                     )
         (GraphicsLayer
           (position 0.00 100.00)
           (bounds 785.00 120.00)
-          (drawsContent 1)
         )
       )
     )
index ac12565..e93ba85 100644 (file)
@@ -9,13 +9,11 @@
           (position 100.00 1100.00)
           (bounds 256.00 256.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 1000.00)
           (bounds 500.00 500.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index af9e67c..27d5828 100644 (file)
@@ -11,13 +11,11 @@ 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)
         )
         (GraphicsLayer
           (position 100.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 83dbc2c..7cc3d55 100644 (file)
@@ -12,7 +12,6 @@
             (GraphicsLayer
               (bounds 10.00 10.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (bounds 785.00 1021.00)
index 2ba637f..f9c9f45 100644 (file)
@@ -10,12 +10,10 @@ Not scaled:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -35,12 +33,10 @@ Scale=0.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -60,12 +56,10 @@ Scale=1.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 5f7e788..db6355d 100644 (file)
@@ -10,13 +10,11 @@ Not scaled:
           (position 600.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -36,12 +34,10 @@ Scale=0.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -61,12 +57,10 @@ Scale=1.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index c4dd7d3..1805938 100644 (file)
@@ -29,7 +29,6 @@
               (position 20.00 45.00)
               (bounds 210.00 100.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
index ac6a0a3..acf5790 100644 (file)
@@ -9,7 +9,6 @@
           (position 18.00 120.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (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 -110.00 0.00 1.00])
         )
         (GraphicsLayer
                   (position 10.00 10.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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 10.00 230.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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 -220.00 0.00 1.00])
                 )
                 (GraphicsLayer
                   (position 10.00 340.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
               )
             )
@@ -50,7 +46,6 @@
           (position 18.00 702.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 50922ab..c6806e4 100644 (file)
@@ -9,7 +9,6 @@ Before:
         (GraphicsLayer
           (position 17.00 119.00)
           (bounds 102.00 102.00)
-          (drawsContent 1)
           (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 -110.00 0.00 1.00])
         )
         (GraphicsLayer
@@ -20,7 +19,6 @@ Before:
             (GraphicsLayer
               (position 21.00 11.00)
               (bounds 102.00 102.00)
-              (drawsContent 1)
               (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])
             )
           )
@@ -28,7 +26,6 @@ Before:
         (GraphicsLayer
           (position 17.00 691.00)
           (bounds 102.00 102.00)
-          (drawsContent 1)
         )
       )
     )
@@ -46,7 +43,6 @@ After:
         (GraphicsLayer
           (position 17.00 119.00)
           (bounds 102.00 102.00)
-          (drawsContent 1)
           (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 -110.00 0.00 1.00])
         )
         (GraphicsLayer
@@ -57,7 +53,6 @@ After:
             (GraphicsLayer
               (position 11.00 11.00)
               (bounds 102.00 102.00)
-              (drawsContent 1)
               (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
@@ -82,7 +77,6 @@ After:
         (GraphicsLayer
           (position 17.00 691.00)
           (bounds 102.00 102.00)
-          (drawsContent 1)
         )
       )
     )
index 2c7b54f..4a6a023 100644 (file)
                   (position 10.00 10.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
                 (GraphicsLayer
                   (position 10.00 120.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
               )
             )
index a66168d..d54e1de 100644 (file)
@@ -14,7 +14,6 @@
         (GraphicsLayer
           (bounds 300.00 300.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 2babcf2..53a3e2c 100644 (file)
@@ -12,7 +12,6 @@
             (GraphicsLayer
               (bounds 500.00 100.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
           )
         )
           (position 50.00 200.00)
           (bounds 500.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 450.00 200.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 0562e9d..db362bc 100644 (file)
@@ -10,7 +10,6 @@ Before:
           (position 108.00 108.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (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])
         )
       )
@@ -30,32 +29,27 @@ After:
           (position 108.00 108.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
           (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)
         )
         (GraphicsLayer
           (position 208.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 8.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 208.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 8b8953c..f76f9f0 100644 (file)
                 (GraphicsLayer
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
                 (GraphicsLayer
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                 )
               )
             )
index e6f3937..cbe8e01 100644 (file)
@@ -111,25 +111,21 @@ After:
           (position 8.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 208.00 8.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 8.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 208.00 158.00)
           (bounds 100.00 150.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 9928916..0ad8f66 100644 (file)
@@ -17,7 +17,6 @@
                   (position 10.00 10.00)
                   (bounds 100.00 100.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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])
                 )
               )
index 84ca66e..b371e99 100644 (file)
@@ -13,7 +13,6 @@
           (position 8.00 8.00)
           (bounds 100.00 50.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index c0adf45..d1706b7 100644 (file)
@@ -9,7 +9,6 @@
           (position 8.00 8.00)
           (bounds 20.00 20.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 8.00 18.00)
index 32c8330..466fad7 100644 (file)
@@ -9,7 +9,6 @@
           (position 18.00 10.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 1f4fff8..8924efd 100644 (file)
@@ -12,14 +12,12 @@ flat
           (bounds 100.00 100.00)
           (contentsOpaque 1)
           (preserves3D 1)
-          (drawsContent 1)
           (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)
           (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])
         )
       )
index c2df6a2..129b81d 100644 (file)
@@ -13,7 +13,6 @@
               (position 2.00 12.00)
               (bounds 100.00 150.00)
               (contentsOpaque 1)
-              (drawsContent 1)
               (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,7 +25,6 @@
               (position 2.00 12.00)
               (bounds 100.00 150.00)
               (contentsOpaque 1)
-              (drawsContent 1)
               (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])
             )
           )
@@ -42,7 +40,6 @@
                   (position 2.00 12.00)
                   (bounds 100.00 150.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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])
                 )
               )
@@ -60,7 +57,6 @@
                   (position 2.00 12.00)
                   (bounds 100.00 150.00)
                   (contentsOpaque 1)
-                  (drawsContent 1)
                   (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])
                 )
               )
index 49c3cff..15360d7 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,7 +27,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -48,7 +46,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
         (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
                     )
index 49c3cff..15360d7 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,7 +27,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -48,7 +46,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
         (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
                     )
index 0d2eee7..c57301e 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 85.00 85.00)
index aaf612b..66ad105 100644 (file)
@@ -9,7 +9,6 @@
           (position 50.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 3236d7a..732ac06 100644 (file)
@@ -10,7 +10,6 @@
           (position 265.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 7f9d570..ac6b5bc 100644 (file)
@@ -10,7 +10,6 @@
           (position 51.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index aaf612b..66ad105 100644 (file)
@@ -9,7 +9,6 @@
           (position 50.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 3236d7a..732ac06 100644 (file)
@@ -10,7 +10,6 @@
           (position 265.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 7f9d570..ac6b5bc 100644 (file)
@@ -10,7 +10,6 @@
           (position 51.00 50.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index d9f60b9..c9274be 100644 (file)
@@ -27,7 +27,6 @@
                                   (position 50.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index d9f60b9..c9274be 100644 (file)
@@ -27,7 +27,6 @@
                                   (position 50.00 50.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index a402118..1bd6836 100644 (file)
@@ -27,7 +27,6 @@
                                   (position 242.00 58.00)
                                   (bounds 100.00 100.00)
                                   (contentsOpaque 1)
-                                  (drawsContent 1)
                                 )
                               )
                             )
index 2a36848..a3138c0 100644 (file)
@@ -9,7 +9,6 @@
           (position 642.00 58.00)
           (bounds 100.00 100.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 49c3cff..15360d7 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,7 +27,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -48,7 +46,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
         (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
                     )
index 49c3cff..15360d7 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,7 +27,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -48,7 +46,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
         (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
                     )
index 0d2eee7..c57301e 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 85.00 85.00)
index af9e67c..27d5828 100644 (file)
@@ -11,13 +11,11 @@ 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)
         )
         (GraphicsLayer
           (position 100.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 83dbc2c..7cc3d55 100644 (file)
@@ -12,7 +12,6 @@
             (GraphicsLayer
               (bounds 10.00 10.00)
               (contentsOpaque 1)
-              (drawsContent 1)
             )
             (GraphicsLayer
               (bounds 785.00 1021.00)
index 2ba637f..f9c9f45 100644 (file)
@@ -10,12 +10,10 @@ Not scaled:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -35,12 +33,10 @@ Scale=0.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -60,12 +56,10 @@ Scale=1.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 5f7e788..db6355d 100644 (file)
@@ -10,13 +10,11 @@ Not scaled:
           (position 600.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (position 0.00 100.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -36,12 +34,10 @@ Scale=0.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
@@ -61,12 +57,10 @@ Scale=1.5:
           (position 600.00 0.00)
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
         (GraphicsLayer
           (bounds 10.00 10.00)
           (contentsOpaque 1)
-          (drawsContent 1)
         )
       )
     )
index 49c3cff..15360d7 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,7 +27,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -48,7 +46,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
         (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
                     )
index 49c3cff..15360d7 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 85.00 100.00)
@@ -28,7 +27,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 2
             (GraphicsLayer
               (bounds 100.00 85.00)
@@ -48,7 +46,6 @@
         (GraphicsLayer
           (position 8.00 13.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 4
             (GraphicsLayer
               (bounds 85.00 85.00)
         (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
                     )
index 0d2eee7..c57301e 100644 (file)
@@ -8,7 +8,6 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 100.00 100.00)
-          (drawsContent 1)
           (children 1
             (GraphicsLayer
               (position 85.00 85.00)
index bd52b7c..f2872d3 100644 (file)
@@ -1,3 +1,25 @@
+2013-03-25  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Support GraphicsLayer::setContentsToSolidColor
+        https://bugs.webkit.org/show_bug.cgi?id=104396
+
+        Reviewed by Adrienne Walker.
+
+        This enables and implements the GraphicsLayer::setContentsToSolidColor
+        path for Chromium.
+
+        Tested by reftests in compositing/background-color/ and several other
+        compositing/ tests.
+
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::supportsBackgroundColorContent):
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::setContentsToSolidColor):
+        (WebCore):
+        * platform/graphics/chromium/GraphicsLayerChromium.h:
+        (WebKit):
+        (GraphicsLayerChromium):
+
 2013-03-25  Victor Carbune  <vcarbune@chromium.org>
 
         TextTrack Extension for WebVTT Regions
index 796fa51..8a022fb 100644 (file)
@@ -424,7 +424,7 @@ public:
 
     static bool supportsBackgroundColorContent()
     {
-#if USE(CA) || USE(TEXTURE_MAPPER)
+#if USE(CA) || USE(TEXTURE_MAPPER) || PLATFORM(CHROMIUM)
         return true;
 #else
         return false;
index dbc4c0b..203d19e 100644 (file)
 #include <public/Platform.h>
 #include <public/WebAnimation.h>
 #include <public/WebCompositorSupport.h>
+#include <public/WebContentLayer.h>
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 #include <public/WebFloatPoint.h>
 #include <public/WebFloatRect.h>
 #include <public/WebImageLayer.h>
 #include <public/WebSize.h>
+#include <public/WebSolidColorLayer.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/HashSet.h>
 #include <wtf/MemoryInstrumentationHashMap.h>
@@ -513,6 +515,40 @@ void GraphicsLayerChromium::setContentsToImage(Image* image)
         updateChildList();
 }
 
+void GraphicsLayerChromium::setContentsToSolidColor(const Color& color)
+{
+    if (color == m_contentsSolidColor)
+        return;
+
+    bool childrenChanged = false;
+
+    m_contentsSolidColor = color;
+
+    if (color.isValid()) {
+        if (!m_contentsSolidColorLayer) {
+            m_contentsSolidColorLayer = adoptPtr(Platform::current()->compositorSupport()->createSolidColorLayer());
+            registerContentsLayer(m_contentsSolidColorLayer->layer());
+
+            setupContentsLayer(m_contentsSolidColorLayer->layer());
+            childrenChanged = true;
+        }
+
+        m_contentsSolidColorLayer->setBackgroundColor(color.rgb());
+        updateContentsRect();
+    } else {
+        if (m_contentsSolidColorLayer) {
+            childrenChanged = true;
+            unregisterContentsLayer(m_contentsSolidColorLayer->layer());
+            m_contentsSolidColorLayer.clear();
+        }
+        m_contentsLayer = 0;
+    }
+
+    if (childrenChanged)
+        updateChildList();
+
+}
+
 static HashSet<int>* s_registeredLayerSet;
 
 void GraphicsLayerChromium::registerContentsLayer(WebLayer* layer)
index 6aa5a63..0d1be26 100644 (file)
 #include "OpaqueRectTrackingContentLayerDelegate.h"
 
 #include <public/WebAnimationDelegate.h>
-#include <public/WebContentLayer.h>
-#include <public/WebImageLayer.h>
-#include <public/WebLayer.h>
 #include <public/WebLayerScrollClient.h>
 #include <wtf/HashMap.h>
 
+namespace WebKit {
+class WebContentLayer;
+class WebImageLayer;
+class WebSolidColorLayer;
+class WebLayer;
+}
+
 namespace WebCore {
 
 class Path;
@@ -113,9 +117,10 @@ public:
     static void registerContentsLayer(WebKit::WebLayer*);
     static void unregisterContentsLayer(WebKit::WebLayer*);
 
-    virtual void setContentsToImage(Image*);
-    virtual void setContentsToMedia(PlatformLayer*);
-    virtual void setContentsToCanvas(PlatformLayer*);
+    virtual void setContentsToImage(Image*) OVERRIDE;
+    virtual void setContentsToMedia(PlatformLayer*) OVERRIDE;
+    virtual void setContentsToCanvas(PlatformLayer*) OVERRIDE;
+    virtual void setContentsToSolidColor(const Color&) OVERRIDE;
     virtual bool hasContentsLayer() const { return m_contentsLayer; }
 
     virtual bool addAnimation(const KeyframeValueList&, const IntSize& boxSize, const Animation*, const String&, double timeOffset);
@@ -184,9 +189,12 @@ private:
 
     String m_nameBase;
 
+    Color m_contentsSolidColor;
+
     OwnPtr<WebKit::WebContentLayer> m_layer;
     OwnPtr<WebKit::WebLayer> m_transformLayer;
     OwnPtr<WebKit::WebImageLayer> m_imageLayer;
+    OwnPtr<WebKit::WebSolidColorLayer> m_contentsSolidColorLayer;
     WebKit::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,
index 0959795..0b06aae 100644 (file)
@@ -1,3 +1,15 @@
+2013-03-25  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Support GraphicsLayer::setContentsToSolidColor
+        https://bugs.webkit.org/show_bug.cgi?id=104396
+
+        Reviewed by Adrienne Walker.
+
+        Updates some unit tests for better include discipline.
+
+        * tests/GraphicsLayerChromiumTest.cpp:
+        * tests/ImageLayerChromiumTest.cpp:
+
 2013-03-25  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r146819.
index 3267a8b..d7405c6 100644 (file)
@@ -37,6 +37,7 @@
 #include <public/WebCompositorSupport.h>
 #include <public/WebFloatAnimationCurve.h>
 #include <public/WebGraphicsContext3D.h>
+#include <public/WebLayer.h>
 #include <public/WebLayerTreeView.h>
 #include <public/WebUnitTestSupport.h>
 #include <wtf/PassOwnPtr.h>
index b9c2810..4db428c 100644 (file)
@@ -29,6 +29,7 @@
 #include "Image.h"
 #include "NativeImageSkia.h"
 #include <gtest/gtest.h>
+#include <public/WebImageLayer.h>
 #include <wtf/PassOwnPtr.h>
 
 using namespace WebCore;