| Index: third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
|
| diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
|
| index 414009bcd258527731213981ea57fe29c2dd5921..b511775d2619c5f2a1b8111ad6d53b9be6e326a0 100644
|
| --- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
|
| +++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt
|
| @@ -2,84 +2,72 @@ This scenario verifies that the cyan "container" element scrolls properly with s
|
|
|
| CASE 1, original layer tree:
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [785, 4050],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [785, 4050],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV id='fixed'",
|
| + "bounds": [400, 200],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backfaceVisibility": "hidden",
|
| + "backgroundColor": "#0000FF"
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow DIV id='compositedInsideFixed'",
|
| + "bounds": [50, 50],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backfaceVisibility": "hidden",
|
| + "backgroundColor": "#FF0000"
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV id='container'",
|
| + "position": [100, 50],
|
| + "bounds": [200, 4000],
|
| + "contentsOpaque": true,
|
| "drawsContent": true,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV id='fixed'",
|
| - "bounds": [400, 200],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backfaceVisibility": "hidden",
|
| - "backgroundColor": "#0000FF",
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow DIV id='compositedInsideFixed'",
|
| - "bounds": [50, 50],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backfaceVisibility": "hidden",
|
| - "backgroundColor": "#FF0000"
|
| - }
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV id='container'",
|
| - "position": [100, 50],
|
| - "bounds": [200, 4000],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FFFF"
|
| - }
|
| - ]
|
| + "backgroundColor": "#00FFFF"
|
| }
|
| ]
|
| }
|
| CASE 2, scrolling y to 80, the "container" element should remain positioned with respect to the scrolled document, the fixed-pos layer compensates for the new scroll position:
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [785, 4050],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [785, 4050],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV id='fixed'",
|
| + "position": [0, 80],
|
| + "bounds": [400, 200],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backfaceVisibility": "hidden",
|
| + "backgroundColor": "#0000FF"
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow DIV id='compositedInsideFixed'",
|
| + "bounds": [50, 50],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backfaceVisibility": "hidden",
|
| + "backgroundColor": "#FF0000"
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV id='container'",
|
| + "position": [100, 50],
|
| + "bounds": [200, 4000],
|
| + "contentsOpaque": true,
|
| "drawsContent": true,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV id='fixed'",
|
| - "position": [0, 80],
|
| - "bounds": [400, 200],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backfaceVisibility": "hidden",
|
| - "backgroundColor": "#0000FF",
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow DIV id='compositedInsideFixed'",
|
| - "bounds": [50, 50],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backfaceVisibility": "hidden",
|
| - "backgroundColor": "#FF0000"
|
| - }
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV id='container'",
|
| - "position": [100, 50],
|
| - "bounds": [200, 4000],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FFFF"
|
| - }
|
| - ]
|
| + "backgroundColor": "#00FFFF"
|
| }
|
| ]
|
| }
|
|
|