Skip to content

GitLab

T
tangled
Commit cd4fe6dc authored by Steve Kobes's avatar Steve Kobes Committed by Commit Bot
Browse files
Options

RLS: Rebaseline three more compositing tests. 

Like previous RLS rebaselines, the layer trees reflect composited
scrolling layers for documents, the elimination of PLC layers on
iframes, and "flattenInheritedTransform": false (crbug.com/778060).

"Child Containment Layer" appears for iframes that are composited by
transform, but lack scrolling layers because they have no overflow or
have scrolling="no" (crbug.com/784053).

Bug: 544140
Change-Id: I03f5cf370724ff2f00de8f8f6b497fa0f39af76e
Reviewed-on: https://chromium-review.googlesource.com/902746Reviewed-by: default avatarStefan Zager <szager@chromium.org>
Commit-Queue: Steve Kobes <skobes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534697}
parent 43b5c50b
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 88 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ cd4fe6dc
......@@ -3286,10 +3286,7 @@ crbug.com/807110 external/wpt/media-source/mediasource-sourcebuffer-mode-timesta
#
# These entries were copied from FlagExpectations/root-layer-scrolls
################################################################################
crbug.com/417782 compositing/iframes/become-composited-nested-iframes.html [ Failure ]
crbug.com/417782 compositing/overflow/tiled-mask.html [ Failure ]
crbug.com/417782 compositing/squashing/squash-above-fixed-1.html [ Failure ]
crbug.com/417782 compositing/squashing/squash-above-fixed-3.html [ Failure ]
crbug.com/417782 compositing/visibility/visibility-image-layers-dynamic.html [ Failure ]
crbug.com/417782 css3/filters/effect-reference-subregion-nested.html [ Failure ]
crbug.com/417782 fast/css/sticky/replaced-sticky.html [ Failure ]
......
third_party/WebKit/LayoutTests/compositing/iframes/become-composited-nested-iframes-expected.txt
View file @ cd4fe6dc
......@@ -3,6 +3,16 @@
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 1500],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF"
......@@ -13,67 +23,33 @@
"bounds": [284, 204]
},
{
"name": "Frame Overflow Controls Host Layer",
"position": [22, 122],
"bounds": [280, 200],
"drawsContent": false
},
{
"name": "Frame Clipping Layer",
"position": [22, 122],
"bounds": [280, 200],
"drawsContent": false
},
{
"name": "Frame Scrolling Layer",
"name": "LayoutView #document",
"position": [22, 122],
"drawsContent": false
"bounds": [280, 200]
},
{
"name": "Content Root Layer",
"name": "Child Containment Layer",
"position": [22, 122],
"bounds": [280, 200],
"drawsContent": false
},
{
"name": "LayoutView #document",
"position": [22, 122],
"bounds": [280, 200]
},
{
"name": "LayoutIFrame IFRAME",
"position": [30, 130],
"bounds": [252, 172]
},
{
"name": "Frame Overflow Controls Host Layer",
"name": "LayoutView #document",
"position": [31, 131],
"bounds": [250, 170],
"drawsContent": false
"backgroundColor": "#C0C0C0"
},
{
"name": "Frame Clipping Layer",
"name": "Child Containment Layer",
"position": [31, 131],
"bounds": [250, 170],
"drawsContent": false
},
{
"name": "Frame Scrolling Layer",
"position": [31, 131],
"drawsContent": false
},
{
"name": "Content Root Layer",
"position": [31, 131],
"bounds": [250, 230],
"drawsContent": false
},
{
"name": "LayoutView #document",
"position": [31, 131],
"bounds": [250, 230],
"backgroundColor": "#C0C0C0"
},
{
"name": "LayoutBlockFlow DIV id='iframe-content' class='box'",
"bounds": [210, 210],
......@@ -87,67 +63,33 @@
"bounds": [284, 204]
},
{
"name": "Frame Overflow Controls Host Layer",
"position": [22, 346],
"bounds": [280, 200],
"drawsContent": false
},
{
"name": "Frame Clipping Layer",
"position": [22, 346],
"bounds": [280, 200],
"drawsContent": false
},
{
"name": "Frame Scrolling Layer",
"name": "LayoutView #document",
"position": [22, 346],
"drawsContent": false
"bounds": [280, 200]
},
{
"name": "Content Root Layer",
"name": "Child Containment Layer",
"position": [22, 346],
"bounds": [280, 200],
"drawsContent": false
},
{
"name": "LayoutView #document",
"position": [22, 346],
"bounds": [280, 200]
},
{
"name": "LayoutIFrame IFRAME",
"position": [30, 354],
"bounds": [252, 172]
},
{
"name": "Frame Overflow Controls Host Layer",
"name": "LayoutView #document",
"position": [31, 355],
"bounds": [250, 170],
"drawsContent": false
"backgroundColor": "#C0C0C0"
},
{
"name": "Frame Clipping Layer",
"name": "Child Containment Layer",
"position": [31, 355],
"bounds": [250, 170],
"drawsContent": false
},
{
"name": "Frame Scrolling Layer",
"position": [31, 355],
"drawsContent": false
},
{
"name": "Content Root Layer",
"position": [31, 355],
"bounds": [250, 230],
"drawsContent": false
},
{
"name": "LayoutView #document",
"position": [31, 355],
"bounds": [250, 230],
"backgroundColor": "#C0C0C0"
},
{
"name": "LayoutBlockFlow DIV id='iframe-content' class='box'",
"bounds": [210, 210],
......
third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt
View file @ cd4fe6dc
......@@ -7,6 +7,16 @@ CASE 1, original layer tree:
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 1400],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF"
......@@ -52,6 +62,16 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint:
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 1400],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF",
......@@ -148,7 +168,8 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint:
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -80, 0, 1]
]
],
"flattenInheritedTransform": false
},
{
"id": 2,
......@@ -205,6 +226,16 @@ CASE 3, scrolling y to 120, no repaints expected:
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 1400],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF",
......@@ -245,7 +276,8 @@ CASE 3, scrolling y to 120, no repaints expected:
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -120, 0, 1]
]
],
"flattenInheritedTransform": false
},
{
"id": 2,
......@@ -264,6 +296,16 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint:
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 1400],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF",
......@@ -360,7 +402,8 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint:
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -170, 0, 1]
]
],
"flattenInheritedTransform": false
},
{
"id": 2,
......
third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
View file @ cd4fe6dc
......@@ -7,6 +7,16 @@ CASE 1, original layer tree:
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 4100],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF"
......@@ -56,6 +66,16 @@ CASE 2, scrolling y by 10 pixels, both the "container" and "inner" should scroll
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 4100],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF",
......@@ -100,7 +120,8 @@ CASE 2, scrolling y by 10 pixels, both the "container" and "inner" should scroll
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -10, 0, 1]
]
],
"flattenInheritedTransform": false
},
{
"id": 2,
......@@ -129,6 +150,16 @@ CASE 3, scrolling y further so that "inner" no longer overlaps the fixed-pos lay
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [785, 600],
"drawsContent": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [785, 4100],
"contentsOpaque": true,
"backgroundColor": "#FFFFFF",
......@@ -171,7 +202,8 @@ CASE 3, scrolling y further so that "inner" no longer overlaps the fixed-pos lay
[0, 1, 0, 0],
[0, 0, 1, 0],
[0, -110, 0, 1]
]
],
"flattenInheritedTransform": false
},
{
"id": 2,
......
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