| Index: third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
|
| diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
|
| index 625daa31264f1c36536ea853340b8d138e9a41d2..a5e7976c5fedbc14676231bcd7d5642ba31f0d9d 100644
|
| --- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
|
| +++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
|
| @@ -1,105 +1,93 @@
|
| CASE 1, original layer tree
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [800, 600],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [800, 600],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'",
|
| + "position": [100, 100],
|
| + "bounds": [100, 100],
|
| + "contentsOpaque": true,
|
| "drawsContent": true,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'",
|
| - "position": [100, 100],
|
| - "bounds": [100, 100],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#0000FF"
|
| - },
|
| - {
|
| - "name": "Squashing Containment Layer",
|
| - "shouldFlattenTransform": false,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| - "position": [20, 20],
|
| - "bounds": [100, 100],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#00FF00",
|
| - "transform": [
|
| - [0.707106781186548, 0.707106781186548, 0, 0],
|
| - [-0.707106781186548, 0.707106781186548, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, 0, 0, 1]
|
| - ]
|
| - },
|
| - {
|
| - "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')",
|
| - "position": [180, 180],
|
| - "bounds": [100, 100],
|
| - "drawsContent": true
|
| - }
|
| - ]
|
| - }
|
| + "backgroundColor": "#0000FF"
|
| + },
|
| + {
|
| + "name": "Squashing Containment Layer",
|
| + "shouldFlattenTransform": false
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| + "position": [20, 20],
|
| + "bounds": [100, 100],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#00FF00",
|
| + "transform": [
|
| + [0.707106781186548, 0.707106781186548, 0, 0],
|
| + [-0.707106781186548, 0.707106781186548, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, 0, 0, 1]
|
| ]
|
| + },
|
| + {
|
| + "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')",
|
| + "position": [180, 180],
|
| + "bounds": [100, 100],
|
| + "drawsContent": true
|
| }
|
| ]
|
| }
|
| CASE 2, hovering over the outer div
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [800, 600],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [800, 600],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'",
|
| + "position": [100, 100],
|
| + "bounds": [100, 100],
|
| + "contentsOpaque": true,
|
| "drawsContent": true,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'",
|
| - "position": [100, 100],
|
| - "bounds": [100, 100],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#0000FF"
|
| - },
|
| + "backgroundColor": "#0000FF"
|
| + },
|
| + {
|
| + "name": "Squashing Containment Layer",
|
| + "shouldFlattenTransform": false
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| + "position": [20, 20],
|
| + "bounds": [100, 100],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#008000",
|
| + "transform": [
|
| + [0.707106781186548, 0.707106781186548, 0, 0],
|
| + [-0.707106781186548, 0.707106781186548, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, 0, 0, 1]
|
| + ],
|
| + "paintInvalidations": [
|
| {
|
| - "name": "Squashing Containment Layer",
|
| - "shouldFlattenTransform": false,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| - "position": [20, 20],
|
| - "bounds": [100, 100],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#008000",
|
| - "transform": [
|
| - [0.707106781186548, 0.707106781186548, 0, 0],
|
| - [-0.707106781186548, 0.707106781186548, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, 0, 0, 1]
|
| - ],
|
| - "paintInvalidations": [
|
| - {
|
| - "object": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| - "rect": [0, 0, 100, 100],
|
| - "reason": "style change"
|
| - }
|
| - ]
|
| - },
|
| - {
|
| - "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')",
|
| - "position": [180, 180],
|
| - "bounds": [100, 100],
|
| - "drawsContent": true
|
| - }
|
| - ]
|
| + "object": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| + "rect": [0, 0, 100, 100],
|
| + "reason": "style change"
|
| }
|
| ]
|
| + },
|
| + {
|
| + "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')",
|
| + "position": [180, 180],
|
| + "bounds": [100, 100],
|
| + "drawsContent": true
|
| }
|
| ],
|
| "objectPaintInvalidations": [
|
| @@ -111,62 +99,56 @@ CASE 2, hovering over the outer div
|
| }
|
| CASE 3, hovering over the inner div
|
| {
|
| - "name": "Content Root Layer",
|
| - "bounds": [800, 600],
|
| - "children": [
|
| + "layers": [
|
| {
|
| "name": "LayoutView #document",
|
| "bounds": [800, 600],
|
| "contentsOpaque": true,
|
| + "drawsContent": true
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'",
|
| + "position": [100, 100],
|
| + "bounds": [100, 100],
|
| + "contentsOpaque": true,
|
| "drawsContent": true,
|
| - "children": [
|
| + "backgroundColor": "#0000FF"
|
| + },
|
| + {
|
| + "name": "Squashing Containment Layer",
|
| + "shouldFlattenTransform": false
|
| + },
|
| + {
|
| + "name": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| + "position": [20, 20],
|
| + "bounds": [100, 100],
|
| + "contentsOpaque": true,
|
| + "drawsContent": true,
|
| + "backgroundColor": "#008000",
|
| + "transform": [
|
| + [0.707106781186548, 0.707106781186548, 0, 0],
|
| + [-0.707106781186548, 0.707106781186548, 0, 0],
|
| + [0, 0, 1, 0],
|
| + [0, 0, 0, 1]
|
| + ],
|
| + "paintInvalidations": [
|
| {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'",
|
| - "position": [100, 100],
|
| - "bounds": [100, 100],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#0000FF"
|
| + "object": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| + "rect": [0, 0, 100, 100],
|
| + "reason": "style change"
|
| },
|
| {
|
| - "name": "Squashing Containment Layer",
|
| - "shouldFlattenTransform": false,
|
| - "children": [
|
| - {
|
| - "name": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| - "position": [20, 20],
|
| - "bounds": [100, 100],
|
| - "contentsOpaque": true,
|
| - "drawsContent": true,
|
| - "backgroundColor": "#008000",
|
| - "transform": [
|
| - [0.707106781186548, 0.707106781186548, 0, 0],
|
| - [-0.707106781186548, 0.707106781186548, 0, 0],
|
| - [0, 0, 1, 0],
|
| - [0, 0, 0, 1]
|
| - ],
|
| - "paintInvalidations": [
|
| - {
|
| - "object": "LayoutBlockFlow (positioned) DIV class='box middle'",
|
| - "rect": [0, 0, 100, 100],
|
| - "reason": "style change"
|
| - },
|
| - {
|
| - "object": "LayoutBlockFlow (positioned) DIV class='smallbox'",
|
| - "rect": [20, 25, 50, 50],
|
| - "reason": "style change"
|
| - }
|
| - ]
|
| - },
|
| - {
|
| - "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')",
|
| - "position": [180, 180],
|
| - "bounds": [100, 100],
|
| - "drawsContent": true
|
| - }
|
| - ]
|
| + "object": "LayoutBlockFlow (positioned) DIV class='smallbox'",
|
| + "rect": [20, 25, 50, 50],
|
| + "reason": "style change"
|
| }
|
| ]
|
| + },
|
| + {
|
| + "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')",
|
| + "position": [180, 180],
|
| + "bounds": [100, 100],
|
| + "drawsContent": true
|
| }
|
| ],
|
| "objectPaintInvalidations": [
|
|
|