Index: third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-after-move-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-after-move-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-after-move-expected.txt |
index a1f8d678730e9c5fcc154cb90b63574f248a0b87..17592517bebc57154a4226facd811e291d841b19 100644 |
--- a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-after-move-expected.txt |
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-after-move-expected.txt |
@@ -1,76 +1,66 @@ |
{ |
- "name": "Content Root Layer", |
- "bounds": [800, 600], |
- "children": [ |
+ "layers": [ |
{ |
"name": "LayoutView #document", |
"bounds": [800, 600], |
"contentsOpaque": true, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "LayoutBlockFlow (positioned) DIV id='scroller'", |
+ "position": [10, 60], |
+ "bounds": [300, 400], |
+ "shouldFlattenTransform": false, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "Scrolling Layer", |
+ "bounds": [285, 385], |
+ "shouldFlattenTransform": false |
+ }, |
+ { |
+ "name": "Scrolling Contents Layer", |
+ "bounds": [285, 900], |
"drawsContent": true, |
- "children": [ |
+ "paintInvalidations": [ |
{ |
- "name": "LayoutBlockFlow (positioned) DIV id='scroller'", |
- "position": [10, 60], |
- "bounds": [300, 400], |
- "shouldFlattenTransform": false, |
- "drawsContent": true, |
- "children": [ |
- { |
- "name": "Scrolling Layer", |
- "bounds": [285, 385], |
- "shouldFlattenTransform": false, |
- "children": [ |
- { |
- "name": "Scrolling Contents Layer", |
- "bounds": [285, 900], |
- "drawsContent": true, |
- "paintInvalidations": [ |
- { |
- "object": "LayoutBlockFlow (positioned) DIV id='block'", |
- "rect": [50, 310, 200, 50], |
- "reason": "bounds change" |
- }, |
- { |
- "object": "LayoutBlockFlow (positioned) DIV id='block'", |
- "rect": [50, 200, 200, 50], |
- "reason": "bounds change" |
- } |
- ] |
- } |
- ] |
- }, |
- { |
- "name": "Overflow Controls Host Layer", |
- "bounds": [300, 400], |
- "children": [ |
- { |
- "name": "Horizontal Scrollbar Layer", |
- "position": [0, 385], |
- "bounds": [285, 15] |
- }, |
- { |
- "name": "Vertical Scrollbar Layer", |
- "position": [285, 0], |
- "bounds": [15, 385], |
- "paintInvalidations": [ |
- { |
- "object": "Vertical Scrollbar Layer", |
- "rect": [0, 0, 15, 385], |
- "reason": "full" |
- } |
- ] |
- }, |
- { |
- "name": "Scroll Corner Layer", |
- "position": [285, 385], |
- "bounds": [15, 15], |
- "drawsContent": true |
- } |
- ] |
- } |
- ] |
+ "object": "LayoutBlockFlow (positioned) DIV id='block'", |
+ "rect": [50, 310, 200, 50], |
+ "reason": "bounds change" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (positioned) DIV id='block'", |
+ "rect": [50, 200, 200, 50], |
+ "reason": "bounds change" |
} |
] |
+ }, |
+ { |
+ "name": "Overflow Controls Host Layer", |
+ "bounds": [300, 400] |
+ }, |
+ { |
+ "name": "Horizontal Scrollbar Layer", |
+ "position": [0, 385], |
+ "bounds": [285, 15] |
+ }, |
+ { |
+ "name": "Vertical Scrollbar Layer", |
+ "position": [285, 0], |
+ "bounds": [15, 385], |
+ "paintInvalidations": [ |
+ { |
+ "object": "Vertical Scrollbar Layer", |
+ "rect": [0, 0, 15, 385], |
+ "reason": "full" |
+ } |
+ ] |
+ }, |
+ { |
+ "name": "Scroll Corner Layer", |
+ "position": [285, 385], |
+ "bounds": [15, 15], |
+ "drawsContent": true |
} |
], |
"objectPaintInvalidations": [ |