Index: third_party/WebKit/LayoutTests/paint/invalidation/repaint-composited-child-in-scrolled-container-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/repaint-composited-child-in-scrolled-container-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/repaint-composited-child-in-scrolled-container-expected.txt |
index c515ed7b5a280ab2add2d26e36fa14960b678fb7..bfa05383f37531a8cf0052da8dc98ee03014fcf9 100644 |
--- a/third_party/WebKit/LayoutTests/paint/invalidation/repaint-composited-child-in-scrolled-container-expected.txt |
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/repaint-composited-child-in-scrolled-container-expected.txt |
@@ -1,79 +1,69 @@ |
{ |
- "name": "Content Root Layer", |
- "bounds": [800, 600], |
- "children": [ |
+ "layers": [ |
{ |
"name": "LayoutView #document", |
"bounds": [800, 600], |
"contentsOpaque": true, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "LayoutBlockFlow (positioned) DIV id='outer'", |
+ "position": [8, 8], |
+ "bounds": [300, 300], |
+ "shouldFlattenTransform": false, |
"drawsContent": true, |
- "children": [ |
+ "backgroundColor": "#0000FF" |
+ }, |
+ { |
+ "name": "Scrolling Layer", |
+ "bounds": [285, 285], |
+ "shouldFlattenTransform": false |
+ }, |
+ { |
+ "name": "Scrolling Contents Layer", |
+ "bounds": [650, 600], |
+ "contentsOpaque": true, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "Overflow Controls Host Layer", |
+ "bounds": [300, 300] |
+ }, |
+ { |
+ "name": "Horizontal Scrollbar Layer", |
+ "position": [0, 285], |
+ "bounds": [285, 15], |
+ "paintInvalidations": [ |
{ |
- "name": "LayoutBlockFlow (positioned) DIV id='outer'", |
- "position": [8, 8], |
- "bounds": [300, 300], |
- "shouldFlattenTransform": false, |
- "drawsContent": true, |
- "backgroundColor": "#0000FF", |
- "children": [ |
- { |
- "name": "Scrolling Layer", |
- "bounds": [285, 285], |
- "shouldFlattenTransform": false, |
- "children": [ |
- { |
- "name": "Scrolling Contents Layer", |
- "bounds": [650, 600], |
- "contentsOpaque": true, |
- "drawsContent": true |
- } |
- ] |
- }, |
- { |
- "name": "Overflow Controls Host Layer", |
- "bounds": [300, 300], |
- "children": [ |
- { |
- "name": "Horizontal Scrollbar Layer", |
- "position": [0, 285], |
- "bounds": [285, 15], |
- "paintInvalidations": [ |
- { |
- "object": "Horizontal Scrollbar Layer", |
- "rect": [0, 0, 285, 15], |
- "reason": "full" |
- } |
- ] |
- }, |
- { |
- "name": "Vertical Scrollbar Layer", |
- "position": [285, 0], |
- "bounds": [15, 285] |
- }, |
- { |
- "name": "Scroll Corner Layer", |
- "position": [285, 285], |
- "bounds": [15, 15], |
- "drawsContent": true |
- } |
- ] |
- } |
- ] |
- }, |
+ "object": "Horizontal Scrollbar Layer", |
+ "rect": [0, 0, 285, 15], |
+ "reason": "full" |
+ } |
+ ] |
+ }, |
+ { |
+ "name": "Vertical Scrollbar Layer", |
+ "position": [285, 0], |
+ "bounds": [15, 285] |
+ }, |
+ { |
+ "name": "Scroll Corner Layer", |
+ "position": [285, 285], |
+ "bounds": [15, 15], |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "LayoutBlockFlow (positioned) DIV id='container'", |
+ "position": [-307, 8], |
+ "bounds": [600, 600], |
+ "contentsOpaque": true, |
+ "drawsContent": true, |
+ "backgroundColor": "#FF0000", |
+ "paintInvalidations": [ |
{ |
- "name": "LayoutBlockFlow (positioned) DIV id='container'", |
- "position": [-307, 8], |
- "bounds": [600, 600], |
- "contentsOpaque": true, |
- "drawsContent": true, |
- "backgroundColor": "#FF0000", |
- "paintInvalidations": [ |
- { |
- "object": "LayoutBlockFlow DIV id='inner'", |
- "rect": [0, 0, 600, 600], |
- "reason": "style change" |
- } |
- ] |
+ "object": "LayoutBlockFlow DIV id='inner'", |
+ "rect": [0, 0, 600, 600], |
+ "reason": "style change" |
} |
] |
} |