Index: LayoutTests/platform/mac-snowleopard/compositing/overflow/composited-scrolling-paint-phases-expected.txt |
diff --git a/LayoutTests/platform/mac-snowleopard/compositing/overflow/composited-scrolling-paint-phases-expected.txt b/LayoutTests/platform/mac-snowleopard/compositing/overflow/composited-scrolling-paint-phases-expected.txt |
index abe551246bb883711245b69463601645a773467c..79f5ffa211aef3f51cca7adac71caa9b12cf0863 100644 |
--- a/LayoutTests/platform/mac-snowleopard/compositing/overflow/composited-scrolling-paint-phases-expected.txt |
+++ b/LayoutTests/platform/mac-snowleopard/compositing/overflow/composited-scrolling-paint-phases-expected.txt |
@@ -1,124 +1,79 @@ |
-(GraphicsLayer |
- (bounds 800.00 600.00) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- (children 1 |
- (GraphicsLayer |
- (bounds 800.00 600.00) |
- (contentsOpaque 1) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- (children 1 |
- (GraphicsLayer |
- (bounds 800.00 242.00) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintMask |
- ) |
- (children 3 |
- (GraphicsLayer |
- (position 29.00 31.00) |
- (bounds 80.00 10.00) |
- (contentsOpaque 1) |
- (drawsContent 1) |
- (backgroundColor #008000) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- ) |
- (GraphicsLayer |
- (bounds 800.00 242.00) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintForeground |
- ) |
- ) |
- (GraphicsLayer |
- (position 28.00 20.00) |
- (bounds 202.00 202.00) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintMask |
- GraphicsLayerPaintCompositedScroll |
- ) |
- (children 4 |
- (GraphicsLayer |
- (position 1.00 1.00) |
- (bounds 185.00 185.00) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- (children 1 |
- (GraphicsLayer |
- (bounds 185.00 715.00) |
- (shouldFlattenTransform 0) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintOverflowContents |
- GraphicsLayerPaintCompositedScroll |
- ) |
- (children 1 |
- (GraphicsLayer |
- (paintingPhases |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintOverflowContents |
- GraphicsLayerPaintCompositedScroll |
- ) |
- ) |
- ) |
- ) |
- ) |
- ) |
- (GraphicsLayer |
- (position 1.00 186.00) |
- (bounds 185.00 15.00) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- ) |
- (GraphicsLayer |
- (position 186.00 1.00) |
- (bounds 15.00 185.00) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- ) |
- (GraphicsLayer |
- (position 186.00 186.00) |
- (bounds 15.00 15.00) |
- (drawsContent 1) |
- (paintingPhases |
- GraphicsLayerPaintBackground |
- GraphicsLayerPaintForeground |
- GraphicsLayerPaintMask |
- ) |
- ) |
- ) |
- ) |
- ) |
- ) |
- ) |
- ) |
- ) |
-) |
+{ |
+ "bounds": [800, 600], |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"], |
+ "children": [ |
+ { |
+ "bounds": [800, 600], |
+ "contentsOpaque": true, |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"], |
+ "children": [ |
+ { |
+ "bounds": [800, 242], |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintMask"], |
+ "children": [ |
+ { |
+ "position": [29, 31], |
+ "bounds": [80, 10], |
+ "contentsOpaque": true, |
+ "drawsContent": true, |
+ "backgroundColor": "#008000", |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"] |
+ }, |
+ { |
+ "bounds": [800, 242], |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintForeground"] |
+ }, |
+ { |
+ "position": [28, 20], |
+ "bounds": [202, 202], |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintMask", "GraphicsLayerPaintCompositedScroll"], |
+ "children": [ |
+ { |
+ "position": [1, 1], |
+ "bounds": [185, 185], |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"], |
+ "children": [ |
+ { |
+ "bounds": [185, 715], |
+ "shouldFlattenTransform": false, |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintForeground", "GraphicsLayerPaintOverflowContents", "GraphicsLayerPaintCompositedScroll"], |
+ "children": [ |
+ { |
+ "paintingPhases": ["GraphicsLayerPaintForeground", "GraphicsLayerPaintOverflowContents", "GraphicsLayerPaintCompositedScroll"] |
+ } |
+ ] |
+ } |
+ ] |
+ }, |
+ { |
+ "position": [1, 186], |
+ "bounds": [185, 15], |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"] |
+ }, |
+ { |
+ "position": [186, 1], |
+ "bounds": [15, 185], |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"] |
+ }, |
+ { |
+ "position": [186, 186], |
+ "bounds": [15, 15], |
+ "drawsContent": true, |
+ "paintingPhases": ["GraphicsLayerPaintBackground", "GraphicsLayerPaintForeground", "GraphicsLayerPaintMask"] |
+ } |
+ ] |
+ } |
+ ] |
+ } |
+ ] |
+ } |
+ ] |
+} |