Index: third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt |
index d5d26f33d784404acf6c9fb3d24adc6deb36a93d..61ac07a7783d5304012696feac844abf406ecc6e 100644 |
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt |
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt |
@@ -4,14 +4,17 @@ This scenario tests (1) that content repaints correctly as layers pop in and out |
CASE 1, original layer tree: |
{ |
+ "name": "Content Root Layer", |
"bounds": [785, 1400], |
"children": [ |
{ |
+ "name": "LayoutView #document", |
"bounds": [785, 1400], |
"contentsOpaque": true, |
"drawsContent": true, |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (positioned) DIV class='composited background'", |
"position": [100, 150], |
"bounds": [300, 300], |
"contentsOpaque": true, |
@@ -19,9 +22,11 @@ CASE 1, original layer tree: |
"backgroundColor": "#D3D3D3" |
}, |
{ |
+ "name": "Squashing Containment Layer", |
"shouldFlattenTransform": false, |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'", |
"position": [0, 100], |
"bounds": [200, 100], |
"contentsOpaque": true, |
@@ -29,6 +34,7 @@ CASE 1, original layer tree: |
"backgroundColor": "#00FF00" |
}, |
{ |
+ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan')", |
"position": [0, 200], |
"bounds": [200, 300], |
"drawsContent": true |
@@ -41,9 +47,11 @@ CASE 1, original layer tree: |
} |
CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: |
{ |
+ "name": "Content Root Layer", |
"bounds": [785, 1400], |
"children": [ |
{ |
+ "name": "LayoutView #document", |
"bounds": [785, 1400], |
"contentsOpaque": true, |
"drawsContent": true, |
@@ -76,6 +84,7 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: |
], |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (positioned) DIV class='composited background'", |
"position": [100, 230], |
"bounds": [300, 300], |
"contentsOpaque": true, |
@@ -83,9 +92,11 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: |
"backgroundColor": "#D3D3D3" |
}, |
{ |
+ "name": "Squashing Containment Layer", |
"shouldFlattenTransform": false, |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", |
"position": [0, 200], |
"bounds": [200, 100], |
"contentsOpaque": true, |
@@ -100,6 +111,7 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: |
] |
}, |
{ |
+ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime')", |
"position": [0, 300], |
"bounds": [200, 300], |
"drawsContent": true, |
@@ -125,18 +137,59 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: |
} |
] |
} |
+ ], |
+ "objectPaintInvalidations": [ |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-f' class='overlapping lime'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-f' class='overlapping lime'", |
+ "reason": "compositing update" |
+ } |
] |
} |
CASE 3, scrolling y to 120, no repaints expected: |
{ |
+ "name": "Content Root Layer", |
"bounds": [785, 1400], |
"children": [ |
{ |
+ "name": "LayoutView #document", |
"bounds": [785, 1400], |
"contentsOpaque": true, |
"drawsContent": true, |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (positioned) DIV class='composited background'", |
"position": [100, 270], |
"bounds": [300, 300], |
"contentsOpaque": true, |
@@ -144,9 +197,11 @@ CASE 3, scrolling y to 120, no repaints expected: |
"backgroundColor": "#D3D3D3" |
}, |
{ |
+ "name": "Squashing Containment Layer", |
"shouldFlattenTransform": false, |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", |
"position": [0, 200], |
"bounds": [200, 100], |
"contentsOpaque": true, |
@@ -154,6 +209,7 @@ CASE 3, scrolling y to 120, no repaints expected: |
"backgroundColor": "#00FFFF" |
}, |
{ |
+ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime')", |
"position": [0, 300], |
"bounds": [200, 300], |
"drawsContent": true |
@@ -166,9 +222,11 @@ CASE 3, scrolling y to 120, no repaints expected: |
} |
CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: |
{ |
+ "name": "Content Root Layer", |
"bounds": [785, 1400], |
"children": [ |
{ |
+ "name": "LayoutView #document", |
"bounds": [785, 1400], |
"contentsOpaque": true, |
"drawsContent": true, |
@@ -201,6 +259,7 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: |
], |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (positioned) DIV class='composited background'", |
"position": [100, 320], |
"bounds": [300, 300], |
"contentsOpaque": true, |
@@ -208,9 +267,11 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: |
"backgroundColor": "#D3D3D3" |
}, |
{ |
+ "name": "Squashing Containment Layer", |
"shouldFlattenTransform": false, |
"children": [ |
{ |
+ "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", |
"position": [0, 300], |
"bounds": [200, 100], |
"contentsOpaque": true, |
@@ -225,6 +286,7 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: |
] |
}, |
{ |
+ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan')", |
"position": [0, 400], |
"bounds": [200, 300], |
"drawsContent": true, |
@@ -250,6 +312,44 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: |
} |
] |
} |
+ ], |
+ "objectPaintInvalidations": [ |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-f' class='overlapping lime'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-g' class='overlapping cyan'", |
+ "reason": "subtree" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-f' class='overlapping lime'", |
+ "reason": "compositing update" |
+ }, |
+ { |
+ "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-g' class='overlapping cyan'", |
+ "reason": "compositing update" |
+ } |
] |
} |