Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt

Issue 2406723002: Auto-rebaseline for r424089 (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt ('k') | third_party/WebKit/LayoutTests/compositing/squashing/squash-compositing-hover-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
index 0125fb9f51a4fc8f304d898248fd432111c0b3aa..7e9b7316a5811e124947315685bc533850f38696 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-3-expected.txt
@@ -4,145 +4,127 @@ The catch is that the squashing requirements should be computed in correct paint
CASE 1, original layer tree:
{
- "name": "Content Root Layer",
- "bounds": [785, 4100],
- "children": [
+ "layers": [
{
"name": "LayoutView #document",
"bounds": [785, 4100],
"contentsOpaque": true,
+ "drawsContent": true
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'",
+ "bounds": [400, 400],
+ "contentsOpaque": true,
"drawsContent": true,
- "children": [
- {
- "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'",
- "bounds": [400, 400],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#808080"
- },
- {
- "name": "LayoutBlockFlow (positioned) DIV id='container'",
- "position": [100, 100],
- "bounds": [100, 4000],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#008000",
- "children": [
- {
- "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'",
- "position": [0, 50],
- "bounds": [200, 100],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#0000FF"
- },
- {
- "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'",
- "position": [100, 0],
- "bounds": [100, 100],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#00FF00"
- }
- ]
- }
- ]
+ "backgroundColor": "#808080"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='container'",
+ "position": [100, 100],
+ "bounds": [100, 4000],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#008000"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'",
+ "position": [0, 50],
+ "bounds": [200, 100],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#0000FF"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'",
+ "position": [100, 0],
+ "bounds": [100, 100],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#00FF00"
}
]
}
CASE 2, scrolling y by 10 pixels, both the "container" and "inner" should scroll properly.
{
- "name": "Content Root Layer",
- "bounds": [785, 4100],
- "children": [
+ "layers": [
{
"name": "LayoutView #document",
"bounds": [785, 4100],
"contentsOpaque": true,
+ "drawsContent": true
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'",
+ "position": [0, 10],
+ "bounds": [400, 400],
+ "contentsOpaque": true,
"drawsContent": true,
- "children": [
- {
- "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'",
- "position": [0, 10],
- "bounds": [400, 400],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#808080"
- },
- {
- "name": "LayoutBlockFlow (positioned) DIV id='container'",
- "position": [100, 100],
- "bounds": [100, 4000],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#008000",
- "children": [
- {
- "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'",
- "position": [0, 60],
- "bounds": [200, 100],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#0000FF"
- },
- {
- "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'",
- "position": [100, 0],
- "bounds": [100, 100],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#00FF00"
- }
- ]
- }
- ]
+ "backgroundColor": "#808080"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='container'",
+ "position": [100, 100],
+ "bounds": [100, 4000],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#008000"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'",
+ "position": [0, 60],
+ "bounds": [200, 100],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#0000FF"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'",
+ "position": [100, 0],
+ "bounds": [100, 100],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#00FF00"
}
]
}
CASE 3, scrolling y further so that "inner" no longer overlaps the fixed-pos layer, then the stacking context of "container" includes the "innerScrolling" layer, and doubles in width:
{
- "name": "Content Root Layer",
- "bounds": [785, 4100],
- "children": [
+ "layers": [
{
"name": "LayoutView #document",
"bounds": [785, 4100],
"contentsOpaque": true,
+ "drawsContent": true
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'",
+ "position": [0, 110],
+ "bounds": [400, 400],
+ "contentsOpaque": true,
"drawsContent": true,
- "children": [
- {
- "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'",
- "position": [0, 110],
- "bounds": [400, 400],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#808080"
- },
+ "backgroundColor": "#808080"
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='container'",
+ "position": [100, 100],
+ "bounds": [200, 4000],
+ "drawsContent": true,
+ "backgroundColor": "#008000",
+ "paintInvalidations": [
{
- "name": "LayoutBlockFlow (positioned) DIV id='container'",
- "position": [100, 100],
- "bounds": [200, 4000],
- "drawsContent": true,
- "backgroundColor": "#008000",
- "paintInvalidations": [
- {
- "object": "LayoutBlockFlow (positioned) DIV id='innerScrolling'",
- "rect": [100, 0, 100, 100],
- "reason": "compositing update"
- }
- ],
- "children": [
- {
- "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'",
- "position": [0, 160],
- "bounds": [200, 100],
- "contentsOpaque": true,
- "drawsContent": true,
- "backgroundColor": "#0000FF"
- }
- ]
+ "object": "LayoutBlockFlow (positioned) DIV id='innerScrolling'",
+ "rect": [100, 0, 100, 100],
+ "reason": "compositing update"
}
]
+ },
+ {
+ "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'",
+ "position": [0, 160],
+ "bounds": [200, 100],
+ "contentsOpaque": true,
+ "drawsContent": true,
+ "backgroundColor": "#0000FF"
}
],
"objectPaintInvalidations": [
« no previous file with comments | « third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-2-expected.txt ('k') | third_party/WebKit/LayoutTests/compositing/squashing/squash-compositing-hover-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698