Changeset 137006 in webkit
- Timestamp:
- Dec 7, 2012 6:29:36 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 24 added
- 90 edited
- 38 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r137002 r137006 1 2012-12-07 No'am Rosenthal <noam@webkit.org> 2 3 Use background color for GraphicsLayers when applicable 4 https://bugs.webkit.org/show_bug.cgi?id=103786 5 6 Created new tests for composited background colors, update existing tests that are affected by the change, 7 and created platform-specific overrides for Chromium, since it does not yet support composited background 8 colors. 9 10 Reviewed by Simon Fraser. 11 12 * compositing/background-color/background-color-alpha-expected.html: Added. 13 * compositing/background-color/background-color-alpha.html: Added. 14 * compositing/background-color/background-color-change-to-text-expected.html: Added. 15 * compositing/background-color/background-color-change-to-text.html: Added. 16 * compositing/background-color/background-color-composite-expected.html: Added. 17 * compositing/background-color/background-color-composite.html: Added. 18 * compositing/background-color/background-color-container-expected.html: Added. 19 * compositing/background-color/background-color-container.html: Added. 20 * compositing/background-color/background-color-content-clip-expected.html: Added. 21 * compositing/background-color/background-color-content-clip.html: Added. 22 * compositing/background-color/background-color-padding-change-expected.html: Added. 23 * compositing/background-color/background-color-padding-change.html: Added. 24 * compositing/background-color/background-color-padding-clip-expected.html: Added. 25 * compositing/background-color/background-color-padding-clip.html: Added. 26 * compositing/background-color/background-color-simple-expected.html: Added. 27 * compositing/background-color/background-color-simple.html: Added. 28 * compositing/background-color/background-color-text-change-expected.html: Added. 29 * compositing/background-color/background-color-text-change.html: Added. 30 * compositing/background-color/background-color-text-clip-expected.html: Added. 31 * compositing/background-color/background-color-text-clip.html: Added. 32 Added new tests for the specific functionality added, with the edge cases regarding composited 33 backgrounds. 34 35 * compositing/backing/no-backing-for-clip-expected.txt: 36 * compositing/backing/no-backing-for-clip-overlap-expected.txt: 37 * compositing/backing/no-backing-for-perspective-expected.txt: 38 * compositing/columns/composited-in-paginated-expected.txt: 39 * compositing/geometry/ancestor-overflow-change-expected.txt: 40 * compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt: 41 * compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt: 42 * compositing/geometry/clip-expected.txt: 43 * compositing/geometry/composited-in-columns-expected.txt: 44 * compositing/geometry/flipped-writing-mode-expected.txt: 45 * compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt: 46 * compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt: 47 * compositing/geometry/limit-layer-bounds-overflow-root-expected.txt: 48 * compositing/geometry/limit-layer-bounds-positioned-expected.txt: 49 * compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt: 50 * compositing/geometry/limit-layer-bounds-transformed-expected.txt: 51 * compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt: 52 * compositing/geometry/preserve-3d-switching-expected.txt: 53 * compositing/iframes/become-composited-nested-iframes-expected.txt: 54 * compositing/iframes/become-overlapped-iframe-expected.txt: 55 * compositing/iframes/composited-parent-iframe-expected.txt: 56 * compositing/iframes/connect-compositing-iframe-delayed-expected.txt: 57 * compositing/iframes/connect-compositing-iframe-expected.txt: 58 * compositing/iframes/connect-compositing-iframe2-expected.txt: 59 * compositing/iframes/connect-compositing-iframe3-expected.txt: 60 * compositing/iframes/enter-compositing-iframe-expected.txt: 61 * compositing/iframes/iframe-resize-expected.txt: 62 * compositing/iframes/invisible-nested-iframe-hide-expected.txt: 63 * compositing/iframes/invisible-nested-iframe-show-expected.txt: 64 * compositing/iframes/overlapped-iframe-expected.txt: 65 * compositing/iframes/overlapped-iframe-iframe-expected.txt: 66 * compositing/iframes/page-cache-layer-tree-expected.txt: 67 * compositing/iframes/scrolling-iframe-expected.txt: 68 * compositing/layer-creation/animation-overlap-with-children-expected.txt: 69 * compositing/layer-creation/fixed-position-and-transform-expected.txt: 70 * compositing/layer-creation/fixed-position-under-transform-expected.txt: 71 * compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt: 72 * compositing/layer-creation/overflow-scroll-overlap-expected.txt: 73 * compositing/layer-creation/overlap-animation-expected.txt: 74 * compositing/layer-creation/overlap-child-layer-expected.txt: 75 * compositing/layer-creation/overlap-clipping-expected.txt: 76 * compositing/layer-creation/overlap-transformed-and-clipped-expected.txt: 77 * compositing/layer-creation/overlap-transformed-layer-expected.txt: 78 * compositing/layer-creation/overlap-transforms-expected.txt: 79 * compositing/layer-creation/scroll-partial-update-expected.txt: 80 * compositing/layer-creation/spanOverlapsCanvas-expected.txt: 81 * compositing/layer-creation/stacking-context-overlap-expected.txt: 82 * compositing/layer-creation/stacking-context-overlap-nested-expected.txt: 83 * compositing/layer-creation/translatez-overlap-expected.txt: 84 * compositing/overflow-trumps-transform-style-expected.txt: 85 * compositing/overflow/clip-descendents-expected.txt: 86 * compositing/plugins/no-backing-store-expected.txt: 87 * compositing/rtl/rtl-absolute-expected.txt: 88 * compositing/rtl/rtl-absolute-overflow-expected.txt: 89 * compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt: 90 * compositing/rtl/rtl-fixed-expected.txt: 91 * compositing/rtl/rtl-fixed-overflow-expected.txt: 92 * compositing/rtl/rtl-relative-expected.txt: 93 * compositing/tiled-layers-hidpi-expected.txt: 94 * compositing/visible-rect/2d-transformed-expected.txt: 95 * compositing/visible-rect/3d-transform-style-expected.txt: 96 * compositing/visible-rect/3d-transformed-expected.txt: 97 * compositing/visible-rect/animated-expected.txt: 98 * compositing/visible-rect/animated-from-none-expected.txt: 99 * compositing/visible-rect/clipped-by-viewport-expected.txt: 100 * compositing/visible-rect/clipped-visible-rect-expected.txt: 101 * compositing/visible-rect/iframe-and-layers-expected.txt: 102 * compositing/visible-rect/nested-transform-expected.txt: 103 * compositing/visible-rect/scrolled-expected.txt: 104 * css3/filters/filtered-compositing-descendant-expected.txt: 105 Updated existing tests that now print different layer-tree results. 106 107 * platform/chromium/compositing/backing/no-backing-for-clip-expected.txt: Copied from LayoutTests/compositing/backing/no-backing-for-clip-expected.txt. 108 * platform/chromium/compositing/backing/no-backing-for-clip-overlap-expected.txt: Copied from LayoutTests/compositing/backing/no-backing-for-clip-overlap-expected.txt. 109 * platform/chromium/compositing/backing/no-backing-for-perspective-expected.txt: Copied from LayoutTests/compositing/backing/no-backing-for-perspective-expected.txt. 110 * platform/chromium/compositing/columns/composited-in-paginated-expected.txt: Copied from LayoutTests/compositing/columns/composited-in-paginated-expected.txt. 111 * platform/chromium/compositing/geometry/ancestor-overflow-change-expected.txt: Copied from LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt. 112 * platform/chromium/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt: Copied from LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt. 113 * platform/chromium/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt: Copied from LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt. 114 * platform/chromium/compositing/geometry/clip-expected.txt: Copied from LayoutTests/compositing/geometry/clip-expected.txt. 115 * platform/chromium/compositing/geometry/composited-in-columns-expected.txt: Copied from LayoutTests/compositing/geometry/composited-in-columns-expected.txt. 116 * platform/chromium/compositing/geometry/flipped-writing-mode-expected.txt: Copied from LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt. 117 * platform/chromium/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt: Copied from LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt. 118 * platform/chromium/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt: Copied from LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt. 119 * platform/chromium/compositing/geometry/limit-layer-bounds-positioned-expected.txt: Copied from LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt. 120 * platform/chromium/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt: Copied from LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt. 121 * platform/chromium/compositing/geometry/limit-layer-bounds-transformed-expected.txt: Copied from LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt. 122 * platform/chromium/compositing/geometry/preserve-3d-switching-expected.txt: Copied from LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt. 123 * platform/chromium/compositing/iframes/invisible-nested-iframe-hide-expected.txt: Copied from LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt. 124 * platform/chromium/compositing/layer-creation/fixed-position-and-transform-expected.txt: Copied from LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt. 125 * platform/chromium/compositing/layer-creation/fixed-position-under-transform-expected.txt: Copied from LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt. 126 * platform/chromium/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt: Copied from LayoutTests/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt. 127 * platform/chromium/compositing/layer-creation/overlap-animation-expected.txt: Copied from LayoutTests/compositing/layer-creation/overlap-animation-expected.txt. 128 * platform/chromium/compositing/layer-creation/overlap-child-layer-expected.txt: Copied from LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt. 129 * platform/chromium/compositing/layer-creation/overlap-clipping-expected.txt: Copied from LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt. 130 * platform/chromium/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt: Copied from LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt. 131 * platform/chromium/compositing/layer-creation/overlap-transformed-layer-expected.txt: Copied from LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt. 132 * platform/chromium/compositing/layer-creation/overlap-transforms-expected.txt: Copied from LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt. 133 * platform/chromium/compositing/layer-creation/scroll-partial-update-expected.txt: Copied from LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt. 134 * platform/chromium/compositing/layer-creation/stacking-context-overlap-expected.txt: Copied from LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt. 135 * platform/chromium/compositing/layer-creation/stacking-context-overlap-nested-expected.txt: Copied from LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt. 136 * platform/chromium/compositing/layer-creation/translatez-overlap-expected.txt: Copied from LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt. 137 * platform/chromium/compositing/overflow-trumps-transform-style-expected.txt: Copied from LayoutTests/compositing/overflow-trumps-transform-style-expected.txt. 138 * platform/chromium/compositing/rtl/rtl-absolute-expected.txt: Copied from LayoutTests/compositing/rtl/rtl-absolute-expected.txt. 139 * platform/chromium/compositing/rtl/rtl-absolute-overflow-expected.txt: Copied from LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt. 140 * platform/chromium/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt: Copied from LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt. 141 * platform/chromium/compositing/rtl/rtl-fixed-expected.txt: Copied from LayoutTests/compositing/rtl/rtl-fixed-expected.txt. 142 * platform/chromium/compositing/rtl/rtl-fixed-overflow-expected.txt: Copied from LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt. 143 * platform/chromium/compositing/rtl/rtl-relative-expected.txt: Copied from LayoutTests/compositing/rtl/rtl-relative-expected.txt. 144 * platform/chromium/css3/filters/filtered-compositing-descendant-expected.txt: Copied from LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt. 145 Create chromium-specific results since chromium does not yet support setContentsToBackgroundColor. 146 1 147 2012-12-07 Stephen White <senorblanco@chromium.org> 2 148 -
trunk/LayoutTests/compositing/backing/no-backing-for-clip-expected.txt
r114283 r137006 26 26 (position 30.00 48.00) 27 27 (bounds 100.00 100.00) 28 ( drawsContent 1)28 (backgroundColor #C0C0C0) 29 29 ) 30 30 ) -
trunk/LayoutTests/compositing/backing/no-backing-for-clip-overlap-expected.txt
r114283 r137006 18 18 (position 30.00 48.00) 19 19 (bounds 100.00 100.00) 20 ( drawsContent 1)20 (backgroundColor #C0C0C0) 21 21 ) 22 22 ) … … 36 36 (position 30.00 48.00) 37 37 (bounds 100.00 100.00) 38 ( drawsContent 1)38 (backgroundColor #C0C0C0) 39 39 ) 40 40 ) -
trunk/LayoutTests/compositing/backing/no-backing-for-perspective-expected.txt
r119529 r137006 20 20 (position 31.00 49.00) 21 21 (bounds 100.00 100.00) 22 ( drawsContent 1)22 (backgroundColor #C0C0C0) 23 23 (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]) 24 24 ) -
trunk/LayoutTests/compositing/columns/composited-in-paginated-expected.txt
r122770 r137006 8 8 (position 818.00 145.00) 9 9 (bounds 100.00 100.00) 10 ( drawsContent 1)10 (backgroundColor #0000FF) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/geometry/ancestor-overflow-change-expected.txt
r115989 r137006 8 8 (position 6.00 6.00) 9 9 (bounds 104.00 104.00) 10 ( drawsContent 1)10 (backgroundColor #008000) 11 11 (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]) 12 12 ) -
trunk/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt
r123971 r137006 22 22 (position 490.00 108.00) 23 23 (bounds 100.00 100.00) 24 ( drawsContent 1)24 (backgroundColor #0000FF) 25 25 ) 26 26 ) -
trunk/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt
r123972 r137006 38 38 (GraphicsLayer 39 39 (bounds 100.00 100.00) 40 ( drawsContent 1)40 (backgroundColor #008000) 41 41 ) 42 42 (GraphicsLayer 43 43 (position 0.00 250.00) 44 44 (bounds 100.00 100.00) 45 ( drawsContent 1)45 (backgroundColor #008000) 46 46 ) 47 47 ) -
trunk/LayoutTests/compositing/geometry/clip-expected.txt
r111456 r137006 16 16 (position 220.00 20.00) 17 17 (bounds 100.00 100.00) 18 ( drawsContent 1)18 (backgroundColor #808080) 19 19 ) 20 20 (GraphicsLayer … … 25 25 (position -5.00 -5.00) 26 26 (bounds 120.00 120.00) 27 ( drawsContent 1)27 (backgroundColor #00000033) 28 28 (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]) 29 29 ) -
trunk/LayoutTests/compositing/geometry/composited-in-columns-expected.txt
r118567 r137006 12 12 (GraphicsLayer 13 13 (bounds 60.00 60.00) 14 ( drawsContent 1)14 (backgroundColor #008000) 15 15 ) 16 16 ) … … 23 23 (GraphicsLayer 24 24 (bounds 60.00 60.00) 25 ( drawsContent 1)25 (backgroundColor #008000) 26 26 ) 27 27 ) -
trunk/LayoutTests/compositing/geometry/flipped-writing-mode-expected.txt
r118567 r137006 8 8 (position 18.00 10.00) 9 9 (bounds 250.00 200.00) 10 ( drawsContent 1)10 (backgroundColor #C0C0C0) 11 11 (children 1 12 12 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt
r76058 r137006 19 19 (position 31.00 39.00) 20 20 (bounds 250.00 220.00) 21 ( drawsContent 1)21 (backgroundColor #0000FF) 22 22 (children 1 23 23 (GraphicsLayer 24 24 (position 10.00 10.00) 25 25 (bounds 200.00 200.00) 26 ( drawsContent 1)26 (backgroundColor #FFFF00) 27 27 (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]) 28 28 (children 1 -
trunk/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
r114175 r137006 13 13 (position 29.00 134.00) 14 14 (bounds 100.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #FF0000) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
r110001 r137006 12 12 (position 21.00 21.00) 13 13 (bounds 100.00 100.00) 14 ( drawsContent 1)14 (backgroundColor #FF0000) 15 15 ) 16 16 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
r110001 r137006 13 13 (position 29.00 29.00) 14 14 (bounds 100.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #FF0000) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
r110001 r137006 13 13 (position 29.00 29.00) 14 14 (bounds 100.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #FF0000) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
r110001 r137006 13 13 (position 129.00 29.00) 14 14 (bounds 200.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #FF0000) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
r110001 r137006 13 13 (position 129.00 29.00) 14 14 (bounds 200.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #FF0000) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt
r114283 r137006 18 18 (opacity 0.80) 19 19 (preserves3D 1) 20 ( drawsContent 1)20 (backgroundColor #FFFF00) 21 21 (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]) 22 22 (children 1 -
trunk/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt
r83820 r137006 49 49 (position 18.00 10.00) 50 50 (bounds 210.00 210.00) 51 ( drawsContent 1)51 (backgroundColor #0000FF) 52 52 ) 53 53 ) … … 118 118 (position 18.00 10.00) 119 119 (bounds 210.00 210.00) 120 ( drawsContent 1)120 (backgroundColor #0000FF) 121 121 ) 122 122 ) … … 146 146 (GraphicsLayer 147 147 (bounds 100.00 100.00) 148 ( drawsContent 1)148 (backgroundColor #0000FF) 149 149 ) 150 150 ) -
trunk/LayoutTests/compositing/iframes/become-overlapped-iframe-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) … … 46 46 (position 5.00 5.00) 47 47 (bounds 150.00 150.00) 48 ( drawsContent 1)48 (backgroundColor #00000099) 49 49 ) 50 50 ) -
trunk/LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) -
trunk/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
r83820 r137006 31 31 (position 18.00 10.00) 32 32 (bounds 210.00 210.00) 33 ( drawsContent 1)33 (backgroundColor #0000FF) 34 34 ) 35 35 ) … … 48 48 (position 8.00 8.00) 49 49 (bounds 100.00 100.00) 50 ( drawsContent 1)50 (backgroundColor #0000FF) 51 51 ) 52 52 ) -
trunk/LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) … … 46 46 (position 5.00 5.00) 47 47 (bounds 50.00 50.00) 48 ( drawsContent 1)48 (backgroundColor #00000033) 49 49 ) 50 50 ) -
trunk/LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) … … 46 46 (position 5.00 5.00) 47 47 (bounds 50.00 50.00) 48 ( drawsContent 1)48 (backgroundColor #00000033) 49 49 ) 50 50 ) -
trunk/LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) -
trunk/LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) … … 46 46 (position 5.00 5.00) 47 47 (bounds 50.00 50.00) 48 ( drawsContent 1)48 (backgroundColor #00000033) 49 49 ) 50 50 ) -
trunk/LayoutTests/compositing/iframes/iframe-resize-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) … … 46 46 (position 5.00 5.00) 47 47 (bounds 50.00 50.00) 48 ( drawsContent 1)48 (backgroundColor #00000033) 49 49 ) 50 50 ) -
trunk/LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt
r84307 r137006 8 8 (position 18.00 10.00) 9 9 (bounds 210.00 210.00) 10 ( drawsContent 1)10 (backgroundColor #0000FF) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt
r115989 r137006 48 48 (position 18.00 10.00) 49 49 (bounds 210.00 210.00) 50 ( drawsContent 1)50 (backgroundColor #0000FF) 51 51 ) 52 52 ) … … 77 77 (position 18.00 202.00) 78 78 (bounds 210.00 210.00) 79 ( drawsContent 1)79 (backgroundColor #0000FF) 80 80 (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]) 81 81 ) -
trunk/LayoutTests/compositing/iframes/overlapped-iframe-expected.txt
r83820 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) … … 46 46 (position 5.00 5.00) 47 47 (bounds 50.00 50.00) 48 ( drawsContent 1)48 (backgroundColor #00000033) 49 49 ) 50 50 ) -
trunk/LayoutTests/compositing/iframes/overlapped-iframe-iframe-expected.txt
r92874 r137006 27 27 (position 18.00 10.00) 28 28 (bounds 210.00 210.00) 29 ( drawsContent 1)29 (backgroundColor #0000FF) 30 30 ) 31 31 ) -
trunk/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt
r89316 r137006 53 53 (position 13.00 55.00) 54 54 (bounds 50.00 50.00) 55 ( drawsContent 1)55 (backgroundColor #00000033) 56 56 ) 57 57 (GraphicsLayer … … 78 78 (position 108.00 100.00) 79 79 (bounds 200.00 200.00) 80 ( drawsContent 1)80 (backgroundColor #0000FF) 81 81 ) 82 82 ) … … 95 95 (position 13.00 279.00) 96 96 (bounds 50.00 50.00) 97 ( drawsContent 1)97 (backgroundColor #00000033) 98 98 ) 99 99 ) -
trunk/LayoutTests/compositing/iframes/scrolling-iframe-expected.txt
r83820 r137006 30 30 (position 108.00 100.00) 31 31 (bounds 200.00 200.00) 32 ( drawsContent 1)32 (backgroundColor #0000FF) 33 33 ) 34 34 ) … … 47 47 (position 5.00 5.00) 48 48 (bounds 50.00 50.00) 49 ( drawsContent 1)49 (backgroundColor #00000033) 50 50 ) 51 51 ) -
trunk/LayoutTests/compositing/layer-creation/animation-overlap-with-children-expected.txt
r123151 r137006 15 15 (position 6.00 6.00) 16 16 (bounds 250.00 50.00) 17 ( drawsContent 1)17 (backgroundColor #C0C0C0) 18 18 ) 19 19 (GraphicsLayer -
trunk/LayoutTests/compositing/layer-creation/fixed-position-and-transform-expected.txt
r118957 r137006 8 8 (position 100.00 1100.00) 9 9 (bounds 256.00 256.00) 10 ( drawsContent 1)10 (backgroundColor #FF0000) 11 11 ) 12 12 (GraphicsLayer 13 13 (position 0.00 1000.00) 14 14 (bounds 500.00 500.00) 15 ( drawsContent 1)15 (backgroundColor #008000) 16 16 ) 17 17 ) -
trunk/LayoutTests/compositing/layer-creation/fixed-position-under-transform-expected.txt
r118957 r137006 15 15 (position 0.00 1000.00) 16 16 (bounds 500.00 500.00) 17 ( drawsContent 1)17 (backgroundColor #008000) 18 18 ) 19 19 ) -
trunk/LayoutTests/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt
r119529 r137006 17 17 (position 31.00 49.00) 18 18 (bounds 100.00 100.00) 19 ( drawsContent 1)19 (backgroundColor #C0C0C0) 20 20 (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]) 21 21 ) -
trunk/LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt
r125856 r137006 21 21 (position 20.00 45.00) 22 22 (bounds 210.00 100.00) 23 ( drawsContent 1)23 (backgroundColor #0000FF) 24 24 ) 25 25 ) -
trunk/LayoutTests/compositing/layer-creation/overlap-animation-expected.txt
r115989 r137006 16 16 (position 10.00 10.00) 17 17 (bounds 100.00 100.00) 18 ( drawsContent 1)18 (backgroundColor #0000FF) 19 19 ) 20 20 (GraphicsLayer 21 21 (position 10.00 120.00) 22 22 (bounds 100.00 100.00) 23 ( drawsContent 1)23 (backgroundColor #0000FF) 24 24 ) 25 25 ) -
trunk/LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt
r88698 r137006 12 12 (GraphicsLayer 13 13 (bounds 300.00 300.00) 14 ( drawsContent 1)14 (backgroundColor #008000) 15 15 ) 16 16 ) -
trunk/LayoutTests/compositing/layer-creation/overlap-clipping-expected.txt
r91114 r137006 11 11 (GraphicsLayer 12 12 (bounds 500.00 100.00) 13 ( drawsContent 1)13 (backgroundColor #008000) 14 14 ) 15 15 ) … … 18 18 (position 50.00 200.00) 19 19 (bounds 500.00 100.00) 20 ( drawsContent 1)20 (backgroundColor #008000) 21 21 ) 22 22 (GraphicsLayer 23 23 (position 450.00 200.00) 24 24 (bounds 100.00 100.00) 25 ( drawsContent 1)25 (backgroundColor #0000FF) 26 26 ) 27 27 ) -
trunk/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt
r109060 r137006 14 14 (GraphicsLayer 15 15 (bounds 100.00 100.00) 16 ( drawsContent 1)16 (backgroundColor #FF0000) 17 17 ) 18 18 (GraphicsLayer 19 19 (bounds 100.00 100.00) 20 ( drawsContent 1)20 (backgroundColor #008000) 21 21 ) 22 22 ) -
trunk/LayoutTests/compositing/layer-creation/overlap-transformed-layer-expected.txt
r89394 r137006 19 19 (GraphicsLayer 20 20 (bounds 300.00 300.00) 21 ( drawsContent 1)21 (backgroundColor #008000) 22 22 ) 23 23 ) -
trunk/LayoutTests/compositing/layer-creation/overlap-transforms-expected.txt
r115989 r137006 16 16 (position 10.00 10.00) 17 17 (bounds 100.00 100.00) 18 ( drawsContent 1)18 (backgroundColor #0000FF) 19 19 (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]) 20 20 ) … … 22 22 (position 10.00 120.00) 23 23 (bounds 100.00 100.00) 24 ( drawsContent 1)24 (backgroundColor #0000FF) 25 25 ) 26 26 ) -
trunk/LayoutTests/compositing/layer-creation/scroll-partial-update-expected.txt
r67682 r137006 13 13 (position 10.00 10.00) 14 14 (bounds 400.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #0000007F) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt
r89511 r137006 13 13 (position 8.00 8.00) 14 14 (bounds 100.00 50.00) 15 ( drawsContent 1)15 (backgroundColor #008000) 16 16 ) 17 17 ) -
trunk/LayoutTests/compositing/layer-creation/stacking-context-overlap-expected.txt
r109851 r137006 8 8 (position 8.00 8.00) 9 9 (bounds 20.00 20.00) 10 ( drawsContent 1)10 (backgroundColor #0000FF) 11 11 ) 12 12 (GraphicsLayer -
trunk/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested-expected.txt
r109851 r137006 20 20 (position 65.00 65.00) 21 21 (bounds 76.00 76.00) 22 ( drawsContent 1)22 (backgroundColor #0000FF) 23 23 ) 24 24 ) -
trunk/LayoutTests/compositing/layer-creation/translatez-overlap-expected.txt
r88580 r137006 8 8 (position 18.00 10.00) 9 9 (bounds 100.00 100.00) 10 ( drawsContent 1)10 (backgroundColor #0000FF) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/overflow-trumps-transform-style-expected.txt
r113461 r137006 11 11 (bounds 100.00 100.00) 12 12 (preserves3D 1) 13 ( drawsContent 1)13 (backgroundColor #0000FF) 14 14 (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]) 15 15 ) … … 17 17 (position 18.00 120.00) 18 18 (bounds 100.00 100.00) 19 ( drawsContent 1)19 (backgroundColor #0000FF) 20 20 (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]) 21 21 ) -
trunk/LayoutTests/compositing/overflow/clip-descendents-expected.txt
r125606 r137006 14 14 (position 2.00 12.00) 15 15 (bounds 100.00 150.00) 16 ( drawsContent 1)16 (backgroundColor #808080) 17 17 (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]) 18 18 ) … … 42 42 (position 2.00 12.00) 43 43 (bounds 100.00 150.00) 44 ( drawsContent 1)44 (backgroundColor #808080) 45 45 (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]) 46 46 ) … … 58 58 (position 2.00 12.00) 59 59 (bounds 100.00 150.00) 60 ( drawsContent 1)60 (backgroundColor #808080) 61 61 (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]) 62 62 ) … … 75 75 (position 2.00 12.00) 76 76 (bounds 100.00 150.00) 77 ( drawsContent 1)77 (backgroundColor #808080) 78 78 (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]) 79 79 ) -
trunk/LayoutTests/compositing/overflow/content-gains-scrollbars-expected.txt
r83820 r137006 8 8 (position 8.00 13.00) 9 9 (bounds 100.00 100.00) 10 (drawsContent 1)11 10 (children 1 12 11 (GraphicsLayer … … 23 22 (position 8.00 13.00) 24 23 (bounds 100.00 100.00) 25 (drawsContent 1)26 24 (children 1 27 25 (GraphicsLayer … … 38 36 (position 8.00 13.00) 39 37 (bounds 100.00 100.00) 40 (drawsContent 1)41 38 (children 1 42 39 (GraphicsLayer … … 53 50 (position 8.00 13.00) 54 51 (bounds 100.00 100.00) 55 (drawsContent 1)56 52 (children 1 57 53 (GraphicsLayer … … 60 56 (GraphicsLayer 61 57 (bounds 10.00 10.00) 62 (drawsContent 1)63 58 ) 64 59 ) -
trunk/LayoutTests/compositing/overflow/overflow-scrollbar-layers-expected.txt
r83820 r137006 8 8 (position 8.00 13.00) 9 9 (bounds 100.00 100.00) 10 (drawsContent 1)11 10 (children 1 12 11 (GraphicsLayer … … 23 22 (position 8.00 13.00) 24 23 (bounds 100.00 100.00) 25 (drawsContent 1)26 24 (children 1 27 25 (GraphicsLayer … … 38 36 (position 8.00 13.00) 39 37 (bounds 100.00 100.00) 40 (drawsContent 1)41 38 (children 1 42 39 (GraphicsLayer … … 53 50 (position 8.00 13.00) 54 51 (bounds 100.00 100.00) 55 (drawsContent 1)56 52 (children 1 57 53 (GraphicsLayer … … 60 56 (GraphicsLayer 61 57 (bounds 10.00 10.00) 62 (drawsContent 1)63 58 ) 64 59 ) -
trunk/LayoutTests/compositing/overflow/resize-painting-expected.txt
r67682 r137006 8 8 (position 18.00 10.00) 9 9 (bounds 100.00 100.00) 10 (drawsContent 1)11 10 ) 12 11 ) -
trunk/LayoutTests/compositing/plugins/no-backing-store-expected.txt
r125101 r137006 13 13 (position 266.00 20.00) 14 14 (bounds 100.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #0000FF) 16 16 ) 17 17 (GraphicsLayer -
trunk/LayoutTests/compositing/rtl/rtl-absolute-expected.txt
r89687 r137006 8 8 (position 50.00 50.00) 9 9 (bounds 100.00 100.00) 10 ( drawsContent 1)10 (backgroundColor #008000) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow-expected.txt
r116560 r137006 9 9 (position 265.00 50.00) 10 10 (bounds 100.00 100.00) 11 ( drawsContent 1)11 (backgroundColor #008000) 12 12 ) 13 13 ) -
trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt
r116560 r137006 9 9 (position 51.00 50.00) 10 10 (bounds 100.00 100.00) 11 ( drawsContent 1)11 (backgroundColor #008000) 12 12 ) 13 13 ) -
trunk/LayoutTests/compositing/rtl/rtl-fixed-expected.txt
r89687 r137006 8 8 (position 50.00 50.00) 9 9 (bounds 100.00 100.00) 10 ( drawsContent 1)10 (backgroundColor #008000) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow-expected.txt
r116560 r137006 9 9 (position 265.00 50.00) 10 10 (bounds 100.00 100.00) 11 ( drawsContent 1)11 (backgroundColor #008000) 12 12 ) 13 13 ) -
trunk/LayoutTests/compositing/rtl/rtl-relative-expected.txt
r89687 r137006 8 8 (position 642.00 58.00) 9 9 (bounds 100.00 100.00) 10 ( drawsContent 1)10 (backgroundColor #008000) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/tiled-layers-hidpi-expected.txt
r104352 r137006 8 8 (position 8.00 8.00) 9 9 (bounds 1800.00 10.00) 10 ( drawsContent 1)10 (backgroundColor #0000FF) 11 11 ) 12 12 ) -
trunk/LayoutTests/compositing/visible-rect/2d-transformed-expected.txt
r131246 r137006 19 19 (GraphicsLayer 20 20 (bounds 200.00 200.00) 21 ( drawsContent 1)21 (backgroundColor #0000FF) 22 22 (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] [-100.00 0.00 0.00 1.00]) 23 23 (visible rect 100.00, 0.00 100.00 x 200.00) … … 25 25 (GraphicsLayer 26 26 (bounds 200.00 200.00) 27 ( drawsContent 1)27 (backgroundColor #0000FF) 28 28 (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] [150.00 0.00 0.00 1.00]) 29 29 (visible rect 0.00, 0.00 200.00 x 200.00) … … 31 31 (GraphicsLayer 32 32 (bounds 200.00 200.00) 33 ( drawsContent 1)33 (backgroundColor #0000FF) 34 34 (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] [400.00 0.00 0.00 1.00]) 35 35 (visible rect 0.00, 0.00 100.00 x 200.00) -
trunk/LayoutTests/compositing/visible-rect/3d-transform-style-expected.txt
r131248 r137006 25 25 (GraphicsLayer 26 26 (bounds 300.00 300.00) 27 ( drawsContent 1)27 (backgroundColor #0000FF) 28 28 (transform [1.00 0.00 0.00 0.00] [0.00 0.91 0.42 0.00] [0.00 -0.42 0.91 0.00] [0.00 0.00 0.00 1.00]) 29 29 (visible rect 0.00, 0.00 213.67 x 200.68) … … 53 53 (GraphicsLayer 54 54 (bounds 300.00 300.00) 55 ( drawsContent 1)55 (backgroundColor #0000FF) 56 56 (transform [0.91 0.00 0.42 0.00] [0.00 1.00 0.00 0.00] [-0.42 0.00 0.91 0.00] [0.00 0.00 0.00 1.00]) 57 57 (visible rect 0.00, 0.00 200.68 x 213.67) -
trunk/LayoutTests/compositing/visible-rect/3d-transformed-expected.txt
r131248 r137006 21 21 (anchor 0.20 0.20) 22 22 (bounds 500.00 500.00) 23 ( drawsContent 1)23 (backgroundColor #0000FF) 24 24 (transform [1.00 0.00 0.00 0.00] [0.00 0.71 0.71 0.00] [0.00 -0.71 0.71 0.00] [0.00 0.00 0.00 1.00]) 25 25 (visible rect 0.00, 0.00 220.62 x 218.46) … … 43 43 (anchor 0.20 0.20) 44 44 (bounds 500.00 500.00) 45 ( drawsContent 1)45 (backgroundColor #0000FF) 46 46 (transform [0.71 0.00 0.71 0.00] [0.00 1.00 0.00 0.00] [-0.71 0.00 0.71 0.00] [0.00 0.00 0.00 1.00]) 47 47 (visible rect 0.00, 0.00 218.46 x 220.62) -
trunk/LayoutTests/compositing/visible-rect/animated-expected.txt
r131626 r137006 19 19 (GraphicsLayer 20 20 (bounds 200.00 200.00) 21 ( drawsContent 1)21 (backgroundColor #0000FF) 22 22 (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] [-100.00 0.00 0.00 1.00]) 23 23 (visible rect 100.00, 0.00 100.00 x 200.00) -
trunk/LayoutTests/compositing/visible-rect/animated-from-none-expected.txt
r131626 r137006 20 20 (position -100.00 0.00) 21 21 (bounds 200.00 200.00) 22 ( drawsContent 1)22 (backgroundColor #0000FF) 23 23 (visible rect 100.00, 0.00 100.00 x 200.00) 24 24 ) -
trunk/LayoutTests/compositing/visible-rect/clipped-by-viewport-expected.txt
r131246 r137006 10 10 (position -100.00 -120.00) 11 11 (bounds 200.00 200.00) 12 ( drawsContent 1)12 (backgroundColor #0000FF) 13 13 (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]) 14 14 (visible rect 100.00, 120.00 100.00 x 80.00) … … 17 17 (position -100.00 200.00) 18 18 (bounds 200.00 200.00) 19 ( drawsContent 1)19 (backgroundColor #0000FF) 20 20 (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]) 21 21 (visible rect 100.00, 0.00 100.00 x 200.00) -
trunk/LayoutTests/compositing/visible-rect/clipped-visible-rect-expected.txt
r131246 r137006 20 20 (position -100.00 0.00) 21 21 (bounds 200.00 200.00) 22 ( drawsContent 1)22 (backgroundColor #0000FF) 23 23 (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]) 24 24 (visible rect 100.00, 0.00 100.00 x 200.00) … … 27 27 (position 150.00 0.00) 28 28 (bounds 200.00 200.00) 29 ( drawsContent 1)29 (backgroundColor #0000FF) 30 30 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 31 31 (visible rect 0.00, 0.00 200.00 x 200.00) … … 34 34 (position 400.00 0.00) 35 35 (bounds 200.00 200.00) 36 ( drawsContent 1)36 (backgroundColor #0000FF) 37 37 (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]) 38 38 (visible rect 0.00, 0.00 100.00 x 200.00) -
trunk/LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt
r131393 r137006 56 56 (position 8.00 226.00) 57 57 (bounds 200.00 200.00) 58 ( drawsContent 1)58 (backgroundColor #0000FF) 59 59 (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 60 (visible rect 0.00, 0.00 200.00 x 200.00) -
trunk/LayoutTests/compositing/visible-rect/nested-transform-expected.txt
r131248 r137006 32 32 (GraphicsLayer 33 33 (bounds 500.00 500.00) 34 ( drawsContent 1)34 (backgroundColor #0000FF) 35 35 (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00]) 36 36 (visible rect 0.00, 0.00 500.00 x 369.91) … … 68 68 (GraphicsLayer 69 69 (bounds 500.00 500.00) 70 ( drawsContent 1)70 (backgroundColor #0000FF) 71 71 (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00]) 72 72 (visible rect 0.00, 0.00 500.00 x 351.87) -
trunk/LayoutTests/compositing/visible-rect/scrolled-expected.txt
r131393 r137006 10 10 (position 8.00 0.00) 11 11 (bounds 200.00 500.00) 12 ( drawsContent 1)12 (backgroundColor #0000FF) 13 13 (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]) 14 14 (visible rect 17.00, 200.00 183.00 x 300.00) -
trunk/LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt
r105090 r137006 13 13 (position 22.00 22.00) 14 14 (bounds 100.00 100.00) 15 ( drawsContent 1)15 (backgroundColor #FF0000) 16 16 (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]) 17 17 ) -
trunk/LayoutTests/platform/chromium/compositing/overflow/content-gains-scrollbars-expected.txt
r100329 r137006 8 8 (position 8.00 13.00) 9 9 (bounds 100.00 100.00) 10 (drawsContent 1)11 10 (children 2 12 11 (GraphicsLayer … … 28 27 (position 8.00 13.00) 29 28 (bounds 100.00 100.00) 30 (drawsContent 1)31 29 (children 2 32 30 (GraphicsLayer … … 48 46 (position 8.00 13.00) 49 47 (bounds 100.00 100.00) 50 (drawsContent 1)51 48 (children 4 52 49 (GraphicsLayer … … 78 75 (position 8.00 13.00) 79 76 (bounds 100.00 100.00) 80 (drawsContent 1)81 77 (children 2 82 78 (GraphicsLayer … … 85 81 (GraphicsLayer 86 82 (bounds 10.00 10.00) 87 (drawsContent 1)88 83 (children 1 89 84 (GraphicsLayer -
trunk/LayoutTests/platform/chromium/compositing/overflow/overflow-scrollbar-layers-expected.txt
r100329 r137006 8 8 (position 8.00 13.00) 9 9 (bounds 100.00 100.00) 10 (drawsContent 1)11 10 (children 2 12 11 (GraphicsLayer … … 28 27 (position 8.00 13.00) 29 28 (bounds 100.00 100.00) 30 (drawsContent 1)31 29 (children 2 32 30 (GraphicsLayer … … 48 46 (position 8.00 13.00) 49 47 (bounds 100.00 100.00) 50 (drawsContent 1)51 48 (children 4 52 49 (GraphicsLayer … … 78 75 (position 8.00 13.00) 79 76 (bounds 100.00 100.00) 80 (drawsContent 1)81 77 (children 2 82 78 (GraphicsLayer … … 85 81 (GraphicsLayer 86 82 (bounds 10.00 10.00) 87 (drawsContent 1)88 83 (children 1 89 84 (GraphicsLayer -
trunk/LayoutTests/platform/chromium/compositing/overflow/resize-painting-expected.txt
r100329 r137006 8 8 (position 18.00 10.00) 9 9 (bounds 100.00 100.00) 10 (drawsContent 1)11 10 (children 1 12 11 (GraphicsLayer -
trunk/LayoutTests/platform/mac/compositing/geometry/fixed-position-composited-switch-expected.txt
r128652 r137006 9 9 (position 495.00 30.00) 10 10 (bounds 300.00 100.00) 11 ( drawsContent 1)11 (backgroundColor #008000) 12 12 ) 13 13 ) … … 26 26 (position 495.00 30.00) 27 27 (bounds 300.00 100.00) 28 ( drawsContent 1)28 (backgroundColor #008000) 29 29 ) 30 30 ) -
trunk/LayoutTests/platform/mac/compositing/iframes/resizer-expected.txt
r87547 r137006 29 29 (position 18.00 10.00) 30 30 (bounds 210.00 210.00) 31 ( drawsContent 1)31 (backgroundColor #0000FF) 32 32 ) 33 33 ) -
trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt
r134287 r137006 13 13 (position 8.00 41.00) 14 14 (bounds 400.00 400.00) 15 (drawsContent 1) 16 (repaint rects 17 (rect 0.00 0.00 400.00 400.00) 18 ) 15 (backgroundColor #008000) 19 16 (children 1 20 17 (GraphicsLayer 21 18 (position 50.00 50.00) 22 19 (bounds 75.00 75.00) 23 (drawsContent 1) 24 (repaint rects 25 (rect 0.00 0.00 75.00 75.00) 26 ) 20 (backgroundColor #0000FF) 27 21 ) 28 22 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt
r132673 r137006 16 16 (position 51.00 101.00) 17 17 (bounds 200.00 4800.00) 18 (usingTiledLayer 1) 19 (drawsContent 1) 18 (backgroundColor #FF0000) 20 19 ) 21 20 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt
r132673 r137006 36 36 (position 51.00 401.00) 37 37 (bounds 200.00 200.00) 38 ( drawsContent 1)38 (backgroundColor #FF0000) 39 39 ) 40 40 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt
r132673 r137006 17 17 (position 51.00 101.00) 18 18 (bounds 200.00 200.00) 19 ( drawsContent 1)19 (backgroundColor #FF0000) 20 20 ) 21 21 (GraphicsLayer 22 22 (position 51.00 4701.00) 23 23 (bounds 200.00 200.00) 24 ( drawsContent 1)24 (backgroundColor #0000FF) 25 25 ) 26 26 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt
r132673 r137006 16 16 (position 51.00 101.00) 17 17 (bounds 200.00 200.00) 18 ( drawsContent 1)18 (backgroundColor #FF0000) 19 19 ) 20 20 (GraphicsLayer 21 21 (position 276.00 201.00) 22 22 (bounds 200.00 200.00) 23 ( drawsContent 1)23 (backgroundColor #0000FF) 24 24 ) 25 25 ) … … 47 47 (position 51.00 101.00) 48 48 (bounds 200.00 200.00) 49 ( drawsContent 1)49 (backgroundColor #FF0000) 50 50 ) 51 51 (GraphicsLayer 52 52 (position 276.00 4701.00) 53 53 (bounds 200.00 200.00) 54 ( drawsContent 1)54 (backgroundColor #0000FF) 55 55 ) 56 56 ) … … 77 77 (position 51.00 101.00) 78 78 (bounds 200.00 200.00) 79 ( drawsContent 1)79 (backgroundColor #FF0000) 80 80 ) 81 81 (GraphicsLayer 82 82 (position 276.00 201.00) 83 83 (bounds 200.00 200.00) 84 ( drawsContent 1)84 (backgroundColor #0000FF) 85 85 ) 86 86 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt
r135059 r137006 12 12 (position 8.00 8.00) 13 13 (bounds 700.00 2500.00) 14 (usingTiledLayer 1) 15 (drawsContent 1) 14 (backgroundColor #C0C0C0) 16 15 (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]) 17 16 (visible rect 0.00, 0.00 482.63 x 357.63) 18 (tile cache coverage 0, 0 640 x 640)19 (tile size 512 x 512)20 (top left tile 0, 0 tiles grid 2 x 2)21 17 ) 22 18 ) -
trunk/Source/WebCore/ChangeLog
r137003 r137006 1 2012-12-07 No'am Rosenthal <noam@webkit.org> 2 3 Use background color for GraphicsLayers when applicable 4 https://bugs.webkit.org/show_bug.cgi?id=103786 5 6 Updated RenderLayerBacking to call GraphicsLayer::setContentsToBackgroundColor when the following conditions take place: 7 1. The layer doesn't paint its own content, other than background/decoration. 8 2. There are no borders or other box decorations (border radius, borders, outline, shadow etc.) 9 3. The image has only a background color, and no background image. 10 4. background-composite is set to source-over, and background-clip is anything apart from text. 11 5. The port supports setContentsToBackgroundColor. 12 13 This allows any implementation of GraphicsLayer that supports setContentsToBackgroundColor to avoid allocating a backing store 14 for that layer, but instead draw that solid color directly. 15 In addition to setting the background color, the layer's contentsRect needs to be adjusted, since the default contents rect of 16 a layer is not always equivalent to the rect where the background is supposed to be painted, which is derived from the box's 17 background-clip property. 18 19 Reviewed by Simon Fraser. 20 21 Tests: compositing/background-color/background-color-alpha.html 22 compositing/background-color/background-color-change-to-text.html 23 compositing/background-color/background-color-composite.html 24 compositing/background-color/background-color-container.html 25 compositing/background-color/background-color-content-clip.html 26 compositing/background-color/background-color-padding-change.html 27 compositing/background-color/background-color-padding-clip.html 28 compositing/background-color/background-color-simple.html 29 compositing/background-color/background-color-text-change.html 30 compositing/background-color/background-color-text-clip.html 31 32 * platform/graphics/GraphicsLayer.h: 33 (WebCore::GraphicsLayer::supportsBackgroundColorContent): 34 Allows different implementation of GraphicsLayer to identify whether they implement setContentsToBackgroundColor. 35 Currently only the MAC implementation and TextureMapper falls under that category. 36 37 * rendering/RenderBox.h: 38 (WebCore::RenderBox::paddingBoxRect): 39 Added paddingBoxRect to compliment borderBoxRect and contentsBoxRect. paddingBoxRect corresponds to 40 background-clip: padding. 41 42 * rendering/RenderLayerBacking.cpp: 43 (WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration): 44 Update the background color if needed, for every configuration change. 45 This should accomodate the old behavior for full-screen, while enabling background color changes for other layers. 46 47 (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry): 48 Move the contentsRect logic to updateContentsRect. 49 50 (WebCore::RenderLayerBacking::updateContentsRect): 51 Use the background box when directly compositing backgrounds. 52 53 (WebCore::RenderLayerBacking::updateBackgroundColor): 54 Set the background color if applicable, otherwise set to trasnparent and clear. 55 This was not needed in the past because background colors were only used for the special case of full-screen. 56 57 (WebCore::supportsDirectBoxDecorationsComposition): 58 Helper function to determine whether a particular background can be directly composited. Right now only 59 background color can be composited, and only if the GraphicsLayer implementation supports background colors. 60 Also we don't yet support background-clip: text and any background-composite other than source-over. 61 62 (WebCore::RenderLayerBacking::paintsBoxDecorations): 63 Apply the new supportsDirectBoxDecorationsComposition logic. 64 65 (WebCore::RenderLayerBacking::contentsBox): 66 Remove unnecessary local variable. 67 68 (WebCore::backgroundRectForBox): 69 (WebCore::RenderLayerBacking::backgroundBox): 70 Figure out the correct rect for the GraphicsLayer's contentsRect, based on the renderer's backgroundClip. 71 The rectangle has to be adjusted based on the composited layer offset, and snapped to an IntRect as 72 GraphicsLayer::contentsRect expects snapped pixels. 73 74 1 75 2012-12-06 Ryosuke Niwa <rniwa@webkit.org> 2 76 -
trunk/Source/WebCore/platform/graphics/GraphicsLayer.h
r136774 r137006 426 426 #endif 427 427 428 static bool supportsBackgroundColorContent() 429 { 430 #if PLATFORM(MAC) || USE(TEXTURE_MAPPER) 431 return true; 432 #else 433 return false; 434 #endif 435 } 436 428 437 void updateDebugIndicators(); 429 438 -
trunk/Source/WebCore/rendering/RenderBox.h
r136954 r137006 140 140 141 141 LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); } 142 LayoutRect paddingBoxRect() const { return LayoutRect(borderLeft(), borderTop(), contentWidth() + paddingLeft() + paddingRight(), contentHeight() + paddingTop() + paddingBottom()); } 142 143 IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), m_frameRect.pixelSnappedSize()); } 143 144 virtual IntRect borderBoundingBox() const { return pixelSnappedBorderBoxRect(); } -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r135060 r137006 501 501 } 502 502 #endif 503 #if ENABLE(FULLSCREEN_API)504 else if (renderer->isRenderFullScreen()) {505 // RenderFullScreen renderers have no content, and only a solid506 // background color. They also can be large enough to trigger the507 // creation of a tiled-layer, which can cause flashing problems508 // during repainting. Special case the RenderFullScreen case because509 // we know its style does not come from CSS and it is therefore will510 // not contain paintable content (e.g. background images, gradients,511 // etc), so safe to set the layer's background color to the renderer's512 // style's background color.513 updateBackgroundColor();514 }515 #endif516 503 if (renderer->isRenderPart()) 517 504 layerConfigChanged = RenderLayerCompositor::parentFrameContentLayers(toRenderPart(renderer)); … … 530 517 531 518 return pixelSnappedIntRect(result); 519 532 520 } 533 521 … … 554 542 updateLayerBlendMode(renderer()->style()); 555 543 #endif 544 545 bool isSimpleContainer = isSimpleContainerCompositingLayer(); 546 547 updateBackgroundColor(isSimpleContainer); 556 548 557 549 m_owningLayer->updateDescendantDependentFlags(); … … 759 751 } 760 752 761 m_graphicsLayer->setContentsRect(contentsBox());762 763 753 // If this layer was created just for clipping or to apply perspective, it doesn't need its own backing store. 764 754 setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLayer, compAncestor)); 765 755 766 updateDrawsContent(); 756 updateContentsRect(isSimpleContainer); 757 updateDrawsContent(isSimpleContainer); 767 758 updateAfterWidgetResize(); 768 759 } … … 806 797 } 807 798 799 void RenderLayerBacking::updateContentsRect(bool isSimpleContainer) 800 { 801 IntRect contentsRect; 802 if (isSimpleContainer && renderer()->hasBackground()) 803 contentsRect = backgroundBox(); 804 else 805 contentsRect = contentsBox(); 806 807 m_graphicsLayer->setContentsRect(contentsRect); 808 } 809 808 810 void RenderLayerBacking::updateDrawsContent() 811 { 812 updateDrawsContent(isSimpleContainerCompositingLayer()); 813 } 814 815 void RenderLayerBacking::updateDrawsContent(bool isSimpleContainer) 809 816 { 810 817 if (m_scrollingLayer) { … … 821 828 } 822 829 823 bool hasPaintedContent = containsPaintedContent();830 bool hasPaintedContent = !isSimpleContainer && containsPaintedContent(); 824 831 825 832 // FIXME: we could refine this to only allocate backing for one of these layers if possible. … … 1138 1145 } 1139 1146 1140 void RenderLayerBacking::updateBackgroundColor() 1141 { 1142 m_graphicsLayer->setContentsToBackgroundColor(rendererBackgroundColor()); 1147 void RenderLayerBacking::updateBackgroundColor(bool isSimpleContainer) 1148 { 1149 Color backgroundColor = Color::transparent; 1150 if (isSimpleContainer) 1151 backgroundColor = rendererBackgroundColor(); 1152 m_graphicsLayer->setContentsToBackgroundColor(backgroundColor); 1153 if (backgroundColor == Color::transparent) 1154 m_graphicsLayer->clearBackgroundColor(); 1155 } 1156 1157 static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer) 1158 { 1159 if (!GraphicsLayer::supportsBackgroundColorContent()) 1160 return false; 1161 1162 if (hasBoxDecorationsOrBackgroundImage(renderer->style())) 1163 return false; 1164 1165 // FIXME: we should be able to allow backgroundComposite; However since this is not a common use case it has been deferred for now. 1166 if (renderer->style()->backgroundComposite() != CompositeSourceOver) 1167 return false; 1168 1169 if (renderer->style()->backgroundClip() == TextFillBox) 1170 return false; 1171 1172 return true; 1143 1173 } 1144 1174 … … 1148 1178 return false; 1149 1179 1150 if (hasBoxDecorationsOrBackground(renderer())) 1180 if (!hasBoxDecorationsOrBackground(renderer())) 1181 return false; 1182 1183 if (!supportsDirectBoxDecorationsComposition(renderer())) 1151 1184 return true; 1152 1185 … … 1334 1367 return; 1335 1368 } 1336 1369 1337 1370 if ((changeType == MaskImageChanged) && m_maskLayer) { 1338 1371 // The composited layer bounds relies on box->maskClipRect(), which changes … … 1369 1402 // This is a no-op if the layer doesn't have an inner layer for the image. 1370 1403 m_graphicsLayer->setContentsToImage(image); 1371 updateDrawsContent(); 1404 bool isSimpleContainer = false; 1405 updateDrawsContent(isSimpleContainer); 1372 1406 1373 1407 // Image animation is "lazy", in that it automatically stops unless someone is drawing … … 1423 1457 contentsRect = pixelSnappedIntRect(toRenderBox(renderer())->contentBoxRect()); 1424 1458 1425 IntSize contentOffset = contentOffsetInCompostingLayer(); 1426 contentsRect.move(contentOffset); 1459 contentsRect.move(contentOffsetInCompostingLayer()); 1427 1460 return contentsRect; 1461 } 1462 1463 static LayoutRect backgroundRectForBox(const RenderBox* box) 1464 { 1465 EFillBox clip = box->style()->backgroundClip(); 1466 switch (clip) { 1467 case BorderFillBox: 1468 return box->borderBoxRect(); 1469 case PaddingFillBox: 1470 return box->paddingBoxRect(); 1471 case ContentFillBox: 1472 return box->contentBoxRect(); 1473 case TextFillBox: 1474 break; 1475 } 1476 1477 ASSERT_NOT_REACHED(); 1478 return LayoutRect(); 1479 } 1480 1481 IntRect RenderLayerBacking::backgroundBox() const 1482 { 1483 if (!renderer()->isBox()) 1484 return IntRect(); 1485 1486 IntRect pixelSnappedBackgroundBox = pixelSnappedIntRect(backgroundRectForBox(toRenderBox(renderer()))); 1487 pixelSnappedBackgroundBox.move(contentOffsetInCompostingLayer()); 1488 return pixelSnappedBackgroundBox; 1428 1489 } 1429 1490 -
trunk/Source/WebCore/rendering/RenderLayerBacking.h
r134642 r137006 165 165 166 166 IntRect contentsBox() const; 167 IntRect backgroundBox() const; 167 168 168 169 // For informative purposes only. … … 204 205 bool requiresScrollCornerLayer() const; 205 206 bool updateScrollingLayers(bool scrollingLayers); 207 void updateDrawsContent(bool isSimpleContainer); 206 208 207 209 GraphicsLayerPaintingPhase paintingPhaseForPrimaryLayer() const; … … 238 240 239 241 Color rendererBackgroundColor() const; 240 void updateBackgroundColor(); 242 void updateBackgroundColor(bool isSimpleContainer); 243 void updateContentsRect(bool isSimpleContainer); 241 244 242 245 bool containsNonEmptyRenderers() const;
Note: See TracChangeset
for help on using the changeset viewer.