| Index: third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
|
| diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
|
| index 37a6e799cf5c23a3dc7c49454cdfd301779c07c7..367e63451cf05ed91aa6f9196e8db2c7b73a6786 100644
|
| --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
|
| +++ b/third_party/WebKit/LayoutTests/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt
|
| @@ -1,127 +1,117 @@
|
| 123456Before:
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [800, 600],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [800, 600],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV id='green-box' class='center box-container'",
|
| + "position": [108, 108],
|
| + "contentsOpaque": true
|
| + },
|
| + {
|
| + "name": "Child Transform Layer",
|
| + "transformOrigin": [50, 50],
|
| + "shouldFlattenTransform": false,
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 0, 1, -0.005],
|
| + [0, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow DIV id='camera' class='rotate-3d-start'",
|
| + "transformOrigin": [50, 50],
|
| + "contentsOpaque": true,
|
| + "shouldFlattenTransform": false,
|
| + "3dRenderingContext": 1,
|
| + "transform": [
|
| + [0.353553390593274, 0.25, -0.5, 0],
|
| + [0, 0.353553390593274, 0.707106781186548, 0],
|
| + [0.353553390593274, -0.25, 0.5, 0],
|
| + [0, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-1'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, 0, 50, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-2'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [0, 0, -1, 0],
|
| + [0, 1, 0, 0],
|
| + [1, 0, 0, 0],
|
| + [50, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-3'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| "drawsContent": true,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV id='green-box' class='center box-container'",
|
| - "position": [108, 108],
|
| - "contentsOpaque": true,
|
| - "children": [
|
| - {
|
| - "name": "Child Transform Layer",
|
| - "transformOrigin": [50, 50],
|
| - "shouldFlattenTransform": false,
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 0, 1, -0.005],
|
| - [0, 0, 0, 1]
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow DIV id='camera' class='rotate-3d-start'",
|
| - "transformOrigin": [50, 50],
|
| - "contentsOpaque": true,
|
| - "shouldFlattenTransform": false,
|
| - "3dRenderingContext": 1,
|
| - "transform": [
|
| - [0.353553390593274, 0.25, -0.5, 0],
|
| - [0, 0.353553390593274, 0.707106781186548, 0],
|
| - [0.353553390593274, -0.25, 0.5, 0],
|
| - [0, 0, 0, 1]
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-1'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, 0, 50, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-2'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [0, 0, -1, 0],
|
| - [0, 1, 0, 0],
|
| - [1, 0, 0, 0],
|
| - [50, 0, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-3'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [-1, 0, 0, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 0, -1, 0],
|
| - [0, 0, -50, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-4'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [0, 0, 1, 0],
|
| - [0, 1, 0, 0],
|
| - [-1, 0, 0, 0],
|
| - [-50, 0, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-5'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, -1, 0, 0],
|
| - [0, -50, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-6'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 0, -1, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 50, 0, 1]
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [-1, 0, 0, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 0, -1, 0],
|
| + [0, 0, -50, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-4'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [0, 0, 1, 0],
|
| + [0, 1, 0, 0],
|
| + [-1, 0, 0, 0],
|
| + [-50, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-5'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, -1, 0, 0],
|
| + [0, -50, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-6'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 0, -1, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 50, 0, 1]
|
| ]
|
| }
|
| ]
|
| @@ -129,149 +119,137 @@
|
|
|
| After:
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [800, 600],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [800, 600],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV id='green-box' class='center box-container'",
|
| + "position": [108, 108],
|
| + "contentsOpaque": true
|
| + },
|
| + {
|
| + "name": "Child Transform Layer",
|
| + "transformOrigin": [50, 50],
|
| + "shouldFlattenTransform": false,
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 0, 1, -0.005],
|
| + [0, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow DIV id='camera' class='rotate-3d-start rotate-3d-end'",
|
| + "transformOrigin": [50, 50],
|
| + "contentsOpaque": true,
|
| + "shouldFlattenTransform": false,
|
| + "3dRenderingContext": 1,
|
| + "transform": [
|
| + [0.707106781186548, 0.5, -0.5, 0],
|
| + [0, 0.707106781186548, 0.707106781186548, 0],
|
| + [0.707106781186548, -0.5, 0.5, 0],
|
| + [0, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-1'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, 0, 50, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-2'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [0, 0, -1, 0],
|
| + [0, 1, 0, 0],
|
| + [1, 0, 0, 0],
|
| + [50, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-3'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [-1, 0, 0, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 0, -1, 0],
|
| + [0, 0, -50, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-4'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [0, 0, 1, 0],
|
| + [0, 1, 0, 0],
|
| + [-1, 0, 0, 0],
|
| + [-50, 0, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-5'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, -1, 0, 0],
|
| + [0, -50, 0, 1]
|
| + ]
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='side side-6'",
|
| + "bounds": [100, 100],
|
| + "3dRenderingContext": 1,
|
| "drawsContent": true,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV id='green-box' class='center box-container'",
|
| - "position": [108, 108],
|
| - "contentsOpaque": true,
|
| - "children": [
|
| - {
|
| - "name": "Child Transform Layer",
|
| - "transformOrigin": [50, 50],
|
| - "shouldFlattenTransform": false,
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 0, 1, -0.005],
|
| - [0, 0, 0, 1]
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow DIV id='camera' class='rotate-3d-start rotate-3d-end'",
|
| - "transformOrigin": [50, 50],
|
| - "contentsOpaque": true,
|
| - "shouldFlattenTransform": false,
|
| - "3dRenderingContext": 1,
|
| - "transform": [
|
| - [0.707106781186548, 0.5, -0.5, 0],
|
| - [0, 0.707106781186548, 0.707106781186548, 0],
|
| - [0.707106781186548, -0.5, 0.5, 0],
|
| - [0, 0, 0, 1]
|
| - ],
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-1'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, 0, 50, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-2'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [0, 0, -1, 0],
|
| - [0, 1, 0, 0],
|
| - [1, 0, 0, 0],
|
| - [50, 0, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-3'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [-1, 0, 0, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 0, -1, 0],
|
| - [0, 0, -50, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-4'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [0, 0, 1, 0],
|
| - [0, 1, 0, 0],
|
| - [-1, 0, 0, 0],
|
| - [-50, 0, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-5'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, -1, 0, 0],
|
| - [0, -50, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='side side-6'",
|
| - "bounds": [100, 100],
|
| - "3dRenderingContext": 1,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00CC",
|
| - "transform": [
|
| - [1, 0, 0, 0],
|
| - [0, 0, -1, 0],
|
| - [0, 1, 0, 0],
|
| - [0, 50, 0, 1]
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| - ]
|
| - }
|
| - ]
|
| - },
|
| - {
|
| - "name": "Squashing Containment Layer",
|
| - "shouldFlattenTransform": false,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='box top left'",
|
| - "position": [8, 8],
|
| - "bounds": [100, 150],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#808080"
|
| - },
|
| - {
|
| - "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top right')",
|
| - "position": [8, 8],
|
| - "bounds": [300, 300],
|
| - "drawsContent": true
|
| - }
|
| - ]
|
| - }
|
| + "backgroundColor": "#00FF00CC",
|
| + "transform": [
|
| + [1, 0, 0, 0],
|
| + [0, 0, -1, 0],
|
| + [0, 1, 0, 0],
|
| + [0, 50, 0, 1]
|
| ]
|
| + },
|
| + {
|
| + "name": "Squashing Containment Layer",
|
| + "shouldFlattenTransform": false
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='box top left'",
|
| + "position": [8, 8],
|
| + "bounds": [100, 150],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#808080"
|
| + },
|
| + {
|
| + "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top right')",
|
| + "position": [8, 8],
|
| + "bounds": [300, 300],
|
| + "drawsContent": true
|
| }
|
| ]
|
| }
|
|
|