Index: third_party/WebKit/LayoutTests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt |
index 011ddb0d00681e28d7a4612c9cdbdf44e946a760..179f15b57bb730a5bee283e05315408e136065b0 100644 |
--- a/third_party/WebKit/LayoutTests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt |
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt |
@@ -1,87 +1,75 @@ |
{ |
- "name": "Content Root Layer", |
- "bounds": [800, 600], |
- "children": [ |
+ "layers": [ |
{ |
"name": "LayoutView #document", |
"bounds": [800, 600], |
"contentsOpaque": true, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "LayoutBlockFlow DIV", |
+ "position": [8, 8], |
+ "bounds": [200, 200], |
+ "contentsOpaque": true, |
+ "shouldFlattenTransform": false, |
+ "drawsContent": true, |
+ "backgroundColor": "#D3D3D3" |
+ }, |
+ { |
+ "name": "Scrolling Layer", |
+ "bounds": [185, 185], |
+ "shouldFlattenTransform": false |
+ }, |
+ { |
+ "name": "Scrolling Contents Layer", |
+ "bounds": [300, 300], |
"drawsContent": true, |
- "children": [ |
+ "paintInvalidations": [ |
{ |
- "name": "LayoutBlockFlow DIV", |
- "position": [8, 8], |
- "bounds": [200, 200], |
- "contentsOpaque": true, |
- "shouldFlattenTransform": false, |
- "drawsContent": true, |
- "backgroundColor": "#D3D3D3", |
- "children": [ |
- { |
- "name": "Scrolling Layer", |
- "bounds": [185, 185], |
- "shouldFlattenTransform": false, |
- "children": [ |
- { |
- "name": "Scrolling Contents Layer", |
- "bounds": [300, 300], |
- "drawsContent": true, |
- "paintInvalidations": [ |
- { |
- "object": "LayoutBlockFlow DIV id='target'", |
- "rect": [100, 100, 200, 200], |
- "reason": "style change" |
- } |
- ], |
- "children": [ |
- { |
- "name": "LayoutBlockFlow (relative positioned) DIV", |
- "bounds": [200, 200], |
- "contentsOpaque": true, |
- "drawsContent": true, |
- "backgroundColor": "#ADD8E6" |
- }, |
- { |
- "name": "LayoutBlockFlow DIV (foreground) Layer", |
- "bounds": [300, 300], |
- "drawsContent": true, |
- "paintInvalidations": [ |
- { |
- "object": "LayoutBlockFlow DIV id='target'", |
- "rect": [100, 100, 200, 200], |
- "reason": "style change" |
- } |
- ] |
- } |
- ] |
- } |
- ] |
- }, |
- { |
- "name": "Overflow Controls Host Layer", |
- "bounds": [200, 200], |
- "children": [ |
- { |
- "name": "Horizontal Scrollbar Layer", |
- "position": [0, 185], |
- "bounds": [185, 15] |
- }, |
- { |
- "name": "Vertical Scrollbar Layer", |
- "position": [185, 0], |
- "bounds": [15, 185] |
- }, |
- { |
- "name": "Scroll Corner Layer", |
- "position": [185, 185], |
- "bounds": [15, 15], |
- "drawsContent": true |
- } |
- ] |
- } |
- ] |
+ "object": "LayoutBlockFlow DIV id='target'", |
+ "rect": [100, 100, 200, 200], |
+ "reason": "style change" |
} |
] |
+ }, |
+ { |
+ "name": "LayoutBlockFlow (relative positioned) DIV", |
+ "bounds": [200, 200], |
+ "contentsOpaque": true, |
+ "drawsContent": true, |
+ "backgroundColor": "#ADD8E6" |
+ }, |
+ { |
+ "name": "LayoutBlockFlow DIV (foreground) Layer", |
+ "bounds": [300, 300], |
+ "drawsContent": true, |
+ "paintInvalidations": [ |
+ { |
+ "object": "LayoutBlockFlow DIV id='target'", |
+ "rect": [100, 100, 200, 200], |
+ "reason": "style change" |
+ } |
+ ] |
+ }, |
+ { |
+ "name": "Overflow Controls Host Layer", |
+ "bounds": [200, 200] |
+ }, |
+ { |
+ "name": "Horizontal Scrollbar Layer", |
+ "position": [0, 185], |
+ "bounds": [185, 15] |
+ }, |
+ { |
+ "name": "Vertical Scrollbar Layer", |
+ "position": [185, 0], |
+ "bounds": [15, 185] |
+ }, |
+ { |
+ "name": "Scroll Corner Layer", |
+ "position": [185, 185], |
+ "bounds": [15, 15], |
+ "drawsContent": true |
} |
], |
"objectPaintInvalidations": [ |