Commit a67f07cb authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot

Rebaseline paint/invalidation/repaint-overlay/layers-overlay.html for run_blinkpy_tests.py

TBR=wangxianzhu@chromium.org

Change-Id: Icedf0b2b72b24d8b45b39b027ab37f60c6ac4a3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1860689Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705639}
parent 1b55e89c
...@@ -55,90 +55,57 @@ function toggle_solid_color(use_solid_color) { ...@@ -55,90 +55,57 @@ function toggle_solid_color(use_solid_color) {
var expected = { var expected = {
"layers": [ "layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"drawsContent": false,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [800, 600],
"drawsContent": false
},
{ {
"name": "Scrolling Contents Layer", "name": "Scrolling Contents Layer",
"bounds": [800, 2016], "bounds": [800, 2016],
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"scrollPosition": [0, 20],
"transform": 1 "transform": 1
}, },
{ {
"name": "LayoutBlockFlow (positioned) DIV id='container'", "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
"position": [40, 50],
"bounds": [100, 100], "bounds": [100, 100],
"backgroundColor": "#0000FF80", "backgroundColor": "#0000FF80",
"paintInvalidations": [ "paintInvalidations": [
{ {
"object": "LayoutBlockFlow (relative positioned) DIV id='child1'", "object": "LayoutNGBlockFlow (relative positioned) DIV id='child1'",
"rect": [20, 20, 10, 10], "rect": [20, 20, 10, 10],
"reason": "background" "reason": "background"
} }
], ],
"transform": 1 "transform": 3
}, },
{ {
"name": "LayoutBlockFlow (relative positioned) DIV id='scrollable'", "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrollable'",
"position": [104, 103],
"bounds": [302, 302], "bounds": [302, 302],
"transform": 1 "transform": 4
},
{
"name": "Scrolling Layer",
"position": [105, 104],
"bounds": [300, 300],
"drawsContent": false,
"transform": 1
},
{
"name": "Scrolling Contents Layer",
"position": [105, 104],
"bounds": [795, 1491],
"drawsContent": false,
"transform": 2
}, },
{ {
"name": "LayoutBlockFlow (relative positioned) DIV id='transform'", "name": "LayoutNGBlockFlow (relative positioned) DIV id='transform'",
"bounds": [200, 200], "bounds": [200, 200],
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFF00", "backgroundColor": "#FFFF00",
"paintInvalidations": [ "paintInvalidations": [
{ {
"object": "LayoutBlockFlow (relative positioned) DIV id='child2'", "object": "LayoutNGBlockFlow (relative positioned) DIV id='child2'",
"rect": [20, 20, 10, 10], "rect": [20, 20, 10, 10],
"reason": "background" "reason": "background"
} }
], ],
"transform": 4 "transform": 7
},
{
"name": "Overflow Controls Host Layer",
"position": [104, 103],
"bounds": [302, 302],
"drawsContent": false,
"transform": 1
}, },
{ {
"name": "Horizontal Scrollbar Layer", "name": "Horizontal Scrollbar Layer",
"position": [105, 404], "position": [1, 301],
"bounds": [300, 0], "bounds": [300, 0],
"transform": 1 "transform": 4
}, },
{ {
"name": "Vertical Scrollbar Layer", "name": "Vertical Scrollbar Layer",
"position": [405, 104], "position": [301, 1],
"bounds": [0, 300], "bounds": [0, 300],
"transform": 1 "transform": 4
} }
], ],
"transforms": [ "transforms": [
...@@ -149,19 +116,16 @@ var expected = { ...@@ -149,19 +116,16 @@ var expected = {
[0, 1, 0, 0], [0, 1, 0, 0],
[0, 0, 1, 0], [0, 0, 1, 0],
[0, -20, 0, 1] [0, -20, 0, 1]
], ]
"flattenInheritedTransform": false
}, },
{ {
"id": 2, "id": 2,
"parent": 1,
"transform": [ "transform": [
[1, 0, 0, 0], [1, 0, 0, 0],
[0, 1, 0, 0], [0, 1, 0, 0],
[0, 0, 1, 0], [0, 0, 1, 0],
[0, -30, 0, 1] [0, -20, 0, 1]
], ]
"flattenInheritedTransform": false
}, },
{ {
"id": 3, "id": 3,
...@@ -170,12 +134,42 @@ var expected = { ...@@ -170,12 +134,42 @@ var expected = {
[1, 0, 0, 0], [1, 0, 0, 0],
[0, 1, 0, 0], [0, 1, 0, 0],
[0, 0, 1, 0], [0, 0, 1, 0],
[193, 181, 0, 1] [40, 50, 0, 1]
] ]
}, },
{ {
"id": 4, "id": 4,
"parent": 3, "parent": 3,
"transform": [
[1, 0, 0, 0],
[0, 1, 0, 0],
[0, 0, 1, 0],
[64, 53, 0, 1]
]
},
{
"id": 5,
"parent": 4,
"transform": [
[1, 0, 0, 0],
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -30, 0, 1]
]
},
{
"id": 6,
"parent": 5,
"transform": [
[1, 0, 0, 0],
[0, 1, 0, 0],
[0, 0, 1, 0],
[89, 78, 0, 1]
]
},
{
"id": 7,
"parent": 6,
"transform": [ "transform": [
[3.53553390593274, 3.53553390593274, 0, 0], [3.53553390593274, 3.53553390593274, 0, 0],
[-3.53553390593274, 3.53553390593274, 0, 0], [-3.53553390593274, 3.53553390593274, 0, 0],
...@@ -189,90 +183,57 @@ var expected = { ...@@ -189,90 +183,57 @@ var expected = {
; ;
var actual = { var actual = {
"layers": [ "layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"drawsContent": false,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [800, 600],
"drawsContent": false
},
{ {
"name": "Scrolling Contents Layer", "name": "Scrolling Contents Layer",
"bounds": [800, 2016], "bounds": [800, 2016],
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"scrollPosition": [0, 20],
"transform": 1 "transform": 1
}, },
{ {
"name": "LayoutBlockFlow (positioned) DIV id='container'", "name": "LayoutNGBlockFlow (positioned) DIV id='container'",
"position": [40, 50],
"bounds": [100, 100], "bounds": [100, 100],
"backgroundColor": "#0000FF80", "backgroundColor": "#0000FF80",
"paintInvalidations": [ "paintInvalidations": [
{ {
"object": "LayoutBlockFlow (relative positioned) DIV id='child1'", "object": "LayoutNGBlockFlow (relative positioned) DIV id='child1'",
"rect": [20, 20, 10, 10], "rect": [20, 20, 10, 10],
"reason": "background" "reason": "background"
} }
], ],
"transform": 1 "transform": 3
}, },
{ {
"name": "LayoutBlockFlow (relative positioned) DIV id='scrollable'", "name": "LayoutNGBlockFlow (relative positioned) DIV id='scrollable'",
"position": [104, 103],
"bounds": [302, 302], "bounds": [302, 302],
"transform": 1 "transform": 4
},
{
"name": "Scrolling Layer",
"position": [105, 104],
"bounds": [300, 300],
"drawsContent": false,
"transform": 1
},
{
"name": "Scrolling Contents Layer",
"position": [105, 104],
"bounds": [795, 1491],
"drawsContent": false,
"transform": 2
}, },
{ {
"name": "LayoutBlockFlow (relative positioned) DIV id='transform'", "name": "LayoutNGBlockFlow (relative positioned) DIV id='transform'",
"bounds": [200, 200], "bounds": [200, 200],
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFF00", "backgroundColor": "#FFFF00",
"paintInvalidations": [ "paintInvalidations": [
{ {
"object": "LayoutBlockFlow (relative positioned) DIV id='child2'", "object": "LayoutNGBlockFlow (relative positioned) DIV id='child2'",
"rect": [20, 20, 10, 10], "rect": [20, 20, 10, 10],
"reason": "background" "reason": "background"
} }
], ],
"transform": 4 "transform": 7
},
{
"name": "Overflow Controls Host Layer",
"position": [104, 103],
"bounds": [302, 302],
"drawsContent": false,
"transform": 1
}, },
{ {
"name": "Horizontal Scrollbar Layer", "name": "Horizontal Scrollbar Layer",
"position": [105, 404], "position": [1, 301],
"bounds": [300, 0], "bounds": [300, 0],
"transform": 1 "transform": 4
}, },
{ {
"name": "Vertical Scrollbar Layer", "name": "Vertical Scrollbar Layer",
"position": [405, 104], "position": [301, 1],
"bounds": [0, 300], "bounds": [0, 300],
"transform": 1 "transform": 4
} }
], ],
"transforms": [ "transforms": [
...@@ -283,19 +244,16 @@ var actual = { ...@@ -283,19 +244,16 @@ var actual = {
[0, 1, 0, 0], [0, 1, 0, 0],
[0, 0, 1, 0], [0, 0, 1, 0],
[0, -20, 0, 1] [0, -20, 0, 1]
], ]
"flattenInheritedTransform": false
}, },
{ {
"id": 2, "id": 2,
"parent": 1,
"transform": [ "transform": [
[1, 0, 0, 0], [1, 0, 0, 0],
[0, 1, 0, 0], [0, 1, 0, 0],
[0, 0, 1, 0], [0, 0, 1, 0],
[0, -30, 0, 1] [0, -20, 0, 1]
], ]
"flattenInheritedTransform": false
}, },
{ {
"id": 3, "id": 3,
...@@ -304,12 +262,42 @@ var actual = { ...@@ -304,12 +262,42 @@ var actual = {
[1, 0, 0, 0], [1, 0, 0, 0],
[0, 1, 0, 0], [0, 1, 0, 0],
[0, 0, 1, 0], [0, 0, 1, 0],
[193, 181, 0, 1] [40, 50, 0, 1]
] ]
}, },
{ {
"id": 4, "id": 4,
"parent": 3, "parent": 3,
"transform": [
[1, 0, 0, 0],
[0, 1, 0, 0],
[0, 0, 1, 0],
[64, 53, 0, 1]
]
},
{
"id": 5,
"parent": 4,
"transform": [
[1, 0, 0, 0],
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -30, 0, 1]
]
},
{
"id": 6,
"parent": 5,
"transform": [
[1, 0, 0, 0],
[0, 1, 0, 0],
[0, 0, 1, 0],
[89, 78, 0, 1]
]
},
{
"id": 7,
"parent": 6,
"transform": [ "transform": [
[3.53553390593274, 3.53553390593274, 0, 0], [3.53553390593274, 3.53553390593274, 0, 0],
[-3.53553390593274, 3.53553390593274, 0, 0], [-3.53553390593274, 3.53553390593274, 0, 0],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment