Disambiguate "background color" and "contents as solid color" on GraphicsLayer

https://bugs.webkit.org/show_bug.cgi?id=104842

Source/WebCore:

Patch by No'am Rosenthal <noam.rosenthal@nokia.com> on 2012-12-15
Reviewed by Simon Fraser.

Rename overloads in GraphicsLayerTextureMapper and GraphicsLayerChromium to account for the rename in GraphicsLayer.

Covered by existing tests.

* platform/graphics/chromium/GraphicsLayerChromium.cpp:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setContentsToSolidColor):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
(GraphicsLayerTextureMapper):
(WebCore::GraphicsLayerTextureMapper::solidColor):
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::paintSelf):
(WebCore::TextureMapperLayer::flushCompositingStateSelf):
* platform/graphics/texmap/TextureMapperLayer.h:
(State):

Source/WebKit2:

Patch by No'am Rosenthal <noam.rosenthal@nokia.com> on 2012-12-15
Reviewed by Simon Fraser.

Rename overloads in coordinated graphics to account for the rename in GraphicsLayer.

* Shared/CoordinatedGraphics/CoordinatedLayerInfo.h:
(CoordinatedLayerInfo):
* UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
(WebKit::LayerTreeRenderer::setLayerState):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::setContentsToSolidColor):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:
(CoordinatedGraphicsLayer):

LayoutTests:

Patch by No'am Rosenthal <noam@webkit.org> on 2012-12-15
Reviewed by Simon Fraser.

Since we don't set the background color for a layer with a solid color, the test results have to be rebaselined.

* compositing/backing/no-backing-for-clip-expected.txt:
* compositing/backing/no-backing-for-clip-overlap-expected.txt:
* compositing/backing/no-backing-for-perspective-expected.txt:
* compositing/columns/composited-in-paginated-expected.txt:
* compositing/geometry/ancestor-overflow-change-expected.txt:
* compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt:
* compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt:
* compositing/geometry/clip-expected.txt:
* compositing/geometry/clip-inside-expected.txt:
* compositing/geometry/composited-in-columns-expected.txt:
* compositing/geometry/flipped-writing-mode-expected.txt:
* compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt:
* compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt:
* compositing/geometry/limit-layer-bounds-overflow-root-expected.txt:
* compositing/geometry/limit-layer-bounds-positioned-expected.txt:
* compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt:
* compositing/geometry/limit-layer-bounds-transformed-expected.txt:
* compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt:
* compositing/geometry/preserve-3d-switching-expected.txt:
* compositing/iframes/become-composited-nested-iframes-expected.txt:
* compositing/iframes/become-overlapped-iframe-expected.txt:
* compositing/iframes/composited-parent-iframe-expected.txt:
* compositing/iframes/connect-compositing-iframe-delayed-expected.txt:
* compositing/iframes/connect-compositing-iframe-expected.txt:
* compositing/iframes/connect-compositing-iframe2-expected.txt:
* compositing/iframes/connect-compositing-iframe3-expected.txt:
* compositing/iframes/enter-compositing-iframe-expected.txt:
* compositing/iframes/iframe-resize-expected.txt:
* compositing/iframes/invisible-nested-iframe-hide-expected.txt:
* compositing/iframes/invisible-nested-iframe-show-expected.txt:
* compositing/iframes/overlapped-iframe-expected.txt:
* compositing/iframes/overlapped-iframe-iframe-expected.txt:
* compositing/iframes/page-cache-layer-tree-expected.txt:
* compositing/iframes/scrolling-iframe-expected.txt:
* compositing/layer-creation/animation-overlap-with-children-expected.txt:
* compositing/layer-creation/fixed-position-and-transform-expected.txt:
* compositing/layer-creation/fixed-position-under-transform-expected.txt:
* compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt:
* compositing/layer-creation/overflow-scroll-overlap-expected.txt:
* compositing/layer-creation/overlap-animation-expected.txt:
* compositing/layer-creation/overlap-child-layer-expected.txt:
* compositing/layer-creation/overlap-clipping-expected.txt:
* compositing/layer-creation/overlap-transformed-and-clipped-expected.txt:
* compositing/layer-creation/overlap-transformed-layer-expected.txt:
* compositing/layer-creation/overlap-transforms-expected.txt:
* compositing/layer-creation/scroll-partial-update-expected.txt:
* compositing/layer-creation/spanOverlapsCanvas-expected.txt:
* compositing/layer-creation/stacking-context-overlap-expected.txt:
* compositing/layer-creation/stacking-context-overlap-nested-expected.txt:
* compositing/layer-creation/translatez-overlap-expected.txt:
* compositing/overflow-trumps-transform-style-expected.txt:
* compositing/overflow/clip-descendents-expected.txt:
* compositing/plugins/no-backing-store-expected.txt:
* compositing/rtl/rtl-absolute-expected.txt:
* compositing/rtl/rtl-absolute-overflow-expected.txt:
* compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt:
* compositing/rtl/rtl-fixed-expected.txt:
* compositing/rtl/rtl-fixed-overflow-expected.txt:
* compositing/rtl/rtl-relative-expected.txt:
* compositing/tiled-layers-hidpi-expected.txt:
* compositing/visible-rect/2d-transformed-expected.txt:
* compositing/visible-rect/3d-transform-style-expected.txt:
* compositing/visible-rect/3d-transformed-expected.txt:
* compositing/visible-rect/animated-expected.txt:
* compositing/visible-rect/animated-from-none-expected.txt:
* compositing/visible-rect/clipped-by-viewport-expected.txt:
* compositing/visible-rect/clipped-visible-rect-expected.txt:
* compositing/visible-rect/iframe-and-layers-expected.txt:
* compositing/visible-rect/nested-transform-expected.txt:
* compositing/visible-rect/scrolled-expected.txt:
* css3/filters/filtered-compositing-descendant-expected.txt:
* platform/mac/compositing/geometry/fixed-position-composited-switch-expected.txt:
* platform/mac/compositing/iframes/resizer-expected.txt:
* platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
* platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt:
* platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt:
* platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt:
* platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt:

git-svn-id: svn://svn.chromium.org/blink/trunk@137798 bbb929c8-8fbe-4397-9dbb-9b2b20218538

15 files changed, 0 insertions, 18 deletions

diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
index 6a1804c..ca7d683 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
@@ -7,7 +7,6 @@
         (GraphicsLayer
           (position 6.00 6.00)
           (bounds 104.00 104.00)
-          (backgroundColor #008000)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
         )
         (GraphicsLayer
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
index 9a91060..7299b1a 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
@@ -21,7 +21,6 @@
             (GraphicsLayer
               (position 490.00 108.00)
               (bounds 100.00 100.00)
-              (backgroundColor #0000FF)
             )
           )
         )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
index c394cc1..0e57db1 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
@@ -37,12 +37,10 @@
         )
         (GraphicsLayer
           (bounds 100.00 100.00)
-          (backgroundColor #008000)
         )
         (GraphicsLayer
           (position 0.00 250.00)
           (bounds 100.00 100.00)
-          (backgroundColor #008000)
         )
       )
     )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt
index dc39c15..0f3fcb6 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-expected.txt
@@ -24,7 +24,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)
-              (backgroundColor #00000033)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt
index 6c4d070..f0c8a7c 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/clip-inside-expected.txt
@@ -25,7 +25,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)
-              (backgroundColor #00000033)
               (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
             )
           )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/composited-in-columns-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/composited-in-columns-expected.txt
index 6a00a15..beb5e80 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/composited-in-columns-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/composited-in-columns-expected.txt
@@ -11,7 +11,6 @@
           (children 1
             (GraphicsLayer
               (bounds 60.00 60.00)
-              (backgroundColor #008000)
             )
           )
         )
@@ -22,7 +21,6 @@
           (children 1
             (GraphicsLayer
               (bounds 60.00 60.00)
-              (backgroundColor #008000)
             )
           )
         )
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
index 669eae9..307caa3 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
@@ -7,7 +7,6 @@
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 250.00 200.00)
-          (backgroundColor #C0C0C0)
           (children 1
             (GraphicsLayer
               (position 35.00 10.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
index 7292edf..e615738 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
@@ -18,12 +18,10 @@ Second dump layer tree:
             (GraphicsLayer
               (position 31.00 39.00)
               (bounds 250.00 220.00)
-              (backgroundColor #0000FF)
               (children 1
                 (GraphicsLayer
                   (position 10.00 10.00)
                   (bounds 200.00 200.00)
-                  (backgroundColor #FFFF00)
                   (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
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
index 85e7f50..a86ceac 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
@@ -12,7 +12,6 @@ Text here
         (GraphicsLayer
           (position 29.00 134.00)
           (bounds 100.00 100.00)
-          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 113.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
index ce48a78..70766ab 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
@@ -11,7 +11,6 @@
         (GraphicsLayer
           (position 21.00 21.00)
           (bounds 100.00 100.00)
-          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (bounds 142.00 142.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
index 7585e18..49929db 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
@@ -12,7 +12,6 @@ Text here
         (GraphicsLayer
           (position 29.00 29.00)
           (bounds 100.00 100.00)
-          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
index 8b6f466..25b907e 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
@@ -12,7 +12,6 @@ Text here
         (GraphicsLayer
           (position 29.00 29.00)
           (bounds 100.00 100.00)
-          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 0.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
index 7d38bf1..1e25fec 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
@@ -12,7 +12,6 @@ Text here
         (GraphicsLayer
           (position 129.00 29.00)
           (bounds 200.00 100.00)
-          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position -971.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
index bc4f471..b92831e 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
@@ -12,7 +12,6 @@ middle
         (GraphicsLayer
           (position 129.00 29.00)
           (bounds 200.00 100.00)
-          (backgroundColor #FF0000)
         )
         (GraphicsLayer
           (position 8.00 8.00)
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/WebKit/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt
index 46bb843..0cd313a 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt
@@ -17,7 +17,6 @@ The green box appear angled out from the yellow box and embedded in it.
               (bounds 280.00 280.00)
               (opacity 0.80)
               (preserves3D 1)
-              (backgroundColor #FFFF00)
               (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