Index: third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt |
index ec8a0c31c48a33ad089371246afa4592991ded8c..40e70c3484c351c6d1b8b146cdb0a6c4b9aa02fc 100644 |
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/invalidate-caret-in-composited-scrolling-container-expected.txt |
@@ -1,81 +1,69 @@ |
{ |
- "name": "Content Root Layer", |
- "bounds": [800, 600], |
- "children": [ |
+ "layers": [ |
{ |
"name": "LayoutView #document", |
"bounds": [800, 600], |
"contentsOpaque": true, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "LayoutTextControl INPUT id='root'", |
+ "position": [5, 5], |
+ "bounds": [47, 25], |
"drawsContent": true, |
- "children": [ |
+ "backgroundColor": "#FFFFFF", |
+ "paintInvalidations": [ |
+ { |
+ "object": "LayoutTextControl INPUT id='root'", |
+ "rect": [0, 0, 47, 25], |
+ "reason": "subtree" |
+ }, |
{ |
- "name": "LayoutTextControl INPUT id='root'", |
- "position": [5, 5], |
- "bounds": [47, 25], |
- "drawsContent": true, |
- "backgroundColor": "#FFFFFF", |
- "paintInvalidations": [ |
- { |
- "object": "LayoutTextControl INPUT id='root'", |
- "rect": [0, 0, 47, 25], |
- "reason": "subtree" |
- }, |
- { |
- "object": "LayoutTextControl INPUT id='root'", |
- "rect": [0, 0, 41, 19], |
- "reason": "full" |
- } |
- ], |
- "children": [ |
- { |
- "name": "LayoutBlockFlow DIV id='inner-editor'", |
- "position": [6, 6], |
- "bounds": [35, 13], |
- "shouldFlattenTransform": false, |
- "drawsContent": true, |
- "children": [ |
- { |
- "name": "Scrolling Layer", |
- "bounds": [35, 13], |
- "shouldFlattenTransform": false, |
- "children": [ |
- { |
- "name": "Scrolling Contents Layer", |
- "bounds": [63, 13], |
- "drawsContent": true, |
- "paintInvalidations": [ |
- { |
- "object": "LayoutText #text", |
- "rect": [60, -1, 3, 15], |
- "reason": "invalidate paint rectangle" |
- } |
- ] |
- } |
- ] |
- }, |
- { |
- "name": "Overflow Controls Host Layer", |
- "bounds": [35, 13], |
- "children": [ |
- { |
- "name": "Horizontal Scrollbar Layer", |
- "position": [0, 13], |
- "bounds": [35, 0], |
- "drawsContent": true |
- }, |
- { |
- "name": "Vertical Scrollbar Layer", |
- "position": [35, 0], |
- "bounds": [0, 13], |
- "drawsContent": true |
- } |
- ] |
- } |
- ] |
- } |
- ] |
+ "object": "LayoutTextControl INPUT id='root'", |
+ "rect": [0, 0, 41, 19], |
+ "reason": "full" |
} |
] |
+ }, |
+ { |
+ "name": "LayoutBlockFlow DIV id='inner-editor'", |
+ "position": [6, 6], |
+ "bounds": [35, 13], |
+ "shouldFlattenTransform": false, |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "Scrolling Layer", |
+ "bounds": [35, 13], |
+ "shouldFlattenTransform": false |
+ }, |
+ { |
+ "name": "Scrolling Contents Layer", |
+ "bounds": [63, 13], |
+ "drawsContent": true, |
+ "paintInvalidations": [ |
+ { |
+ "object": "LayoutText #text", |
+ "rect": [60, -1, 3, 15], |
+ "reason": "invalidate paint rectangle" |
+ } |
+ ] |
+ }, |
+ { |
+ "name": "Overflow Controls Host Layer", |
+ "bounds": [35, 13] |
+ }, |
+ { |
+ "name": "Horizontal Scrollbar Layer", |
+ "position": [0, 13], |
+ "bounds": [35, 0], |
+ "drawsContent": true |
+ }, |
+ { |
+ "name": "Vertical Scrollbar Layer", |
+ "position": [35, 0], |
+ "bounds": [0, 13], |
+ "drawsContent": true |
} |
], |
"objectPaintInvalidations": [ |