Skip to content

Commit

Permalink
Sync svg/painting/reftests from WPT upstream
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=269467

Reviewed by Tim Nguyen.

This PR is to sync `svg/painting/reftests` from WPT upstream:

Upstream commit: web-platform-tests/wpt@b9dc4df

> Remove Test Expectations (.txt):
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-003-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-011-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-012-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-013-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-units-userspaceonuse-non-scaling-stroke-expected.txt:

> Modified Files:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/w3c-import.log:
* LayoutTests/imported/w3c/resources/resource-files.json:

> Modified Tests & Test Expectations:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/display-none-mask-expected.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/display-none-mask.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-001.svg:

> New Tests & Test Expectations:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/display-none-mask-ref.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/fallback-001-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/fallback-001.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/fallback-002.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/fallback-002-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-implicit-subpaths-expected.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-implicit-subpaths.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-001-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-002-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-003-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-011-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-012-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-013-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-021-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-022-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-023-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/marker-units-userspaceonuse-non-scaling-stroke-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/markers-orient-001-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/markers-orient-002-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/markers-orient-002.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/mask-percentage-expected.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/mask-percentage-ref.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/mask-percentage.html:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/mask-print-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/paint-context-001-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/paint-context-002-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/paint-order-001-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/paintorder-text-decorations-ref.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/paintorder-text-decorations.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/percentage-attribute-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/percentage-expected.svg:
* LayoutTests/imported/w3c/web-platform-tests/svg/painting/reftests/paintorder-text-decorations-expected.svg:

> Test Expectations [ Failure ]:
* LayoutTests/TestExpectations:

> Test Expectations [ Failure & ImageOnlyFailure] - Platform:
* LayoutTests/platform/ios/TestExpectations:
* LayoutTests/platform/mac/TestExpectations:

Canonical link: https://commits.webkit.org/274810@main
  • Loading branch information
Ahmad-S792 authored and Ahmad Saleem committed Feb 16, 2024
1 parent aa59663 commit e432d40
Show file tree
Hide file tree
Showing 48 changed files with 1,368 additions and 129 deletions.
14 changes: 14 additions & 0 deletions LayoutTests/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -7455,3 +7455,17 @@ webkit.org/b/267951 imported/w3c/web-platform-tests/html/dom/elements/global-att
webkit.org/b/267951 imported/w3c/web-platform-tests/html/dom/elements/global-attributes/dir-shadow-39.html [ ImageOnlyFailure ]
webkit.org/b/267951 imported/w3c/web-platform-tests/html/dom/elements/global-attributes/dir-shadow-41.html [ ImageOnlyFailure ]
webkit.org/b/267951 imported/w3c/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN.html [ ImageOnlyFailure ]

# web-platform-tests/svg/painting/reftests failures
imported/w3c/web-platform-tests/svg/painting/reftests/fallback-001.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/marker-implicit-subpaths.html [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-003.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-011.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-012.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/marker-path-013.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/markers-orient-002.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/paint-context-001.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/paint-context-002.svg [ Failure ]
imported/w3c/web-platform-tests/svg/painting/reftests/paintorder-text-decorations.svg [ Failure ]
imported/w3c/web-platform-tests/svg/text/reftests/transform-dynamic-change.html [ Failure ]
19 changes: 19 additions & 0 deletions LayoutTests/imported/w3c/resources/resource-files.json
Original file line number Diff line number Diff line change
Expand Up @@ -7936,6 +7936,25 @@
"web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-002-ref.html",
"web-platform-tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001-ref.html",
"web-platform-tests/streams/readable-streams/crashtests/strategy-worker-terminate.html",
"web-platform-tests/svg/painting/reftests/display-none-mask-ref.html",
"web-platform-tests/svg/painting/reftests/marker-path-001-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-002-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-003-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-011-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-012-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-013-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-021-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-022-ref.svg",
"web-platform-tests/svg/painting/reftests/marker-path-023-ref.svg",
"web-platform-tests/svg/painting/reftests/markers-orient-001-ref.svg",
"web-platform-tests/svg/painting/reftests/mask-percentage-ref.html",
"web-platform-tests/svg/painting/reftests/mask-print-ref.svg",
"web-platform-tests/svg/painting/reftests/paint-context-001-ref.svg",
"web-platform-tests/svg/painting/reftests/paint-context-002-ref.svg",
"web-platform-tests/svg/painting/reftests/paint-order-001-ref.svg",
"web-platform-tests/svg/painting/reftests/paintorder-text-decorations-ref.svg",
"web-platform-tests/svg/painting/reftests/paintorder-text-decorations.svg",
"web-platform-tests/svg/painting/reftests/percentage-ref.svg",
"web-platform-tests/svg/text/reftests/gradient-after-reposition-ref.html",
"web-platform-tests/svg/text/reftests/text-clipped-offscreen-move-onscreen-ref.html",
"web-platform-tests/svg/text/reftests/text-transform-001-ref.html",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<body>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: red"></div>
<div style="width: 200px; height: 200px;"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: red"></div>
<div style="width: 200px; height: 200px; background: green"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
Expand All @@ -23,28 +23,28 @@
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px;"></div>
<div style="width: 200px; height: 200px; background: green"></div>
</foreignobject>
</svg>

<!-- make sure masking actually works -->
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="red"></rect>
<rect x="0" y="100" width="100" height="50" fill="red"></rect>
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="red"></rect>
<rect x="0" y="100" width="100" height="50" fill="red"></rect>
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>

<!-- make sure masking works on active content -->
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="red"></rect>
<rect x="0" y="100" width="100" height="50" fill="red"></rect>
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="red"></rect>
<rect x="0" y="100" width="100" height="50" fill="red"></rect>
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
</head>

<body>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px;"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: green"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px;"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: green"></div>
</foreignobject>
</svg>

<!-- make sure masking actually works -->
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>

<!-- make sure masking works on active content -->
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>
<svg width="200" height="200">
<rect x="0" y="0" width="100" height="50" fill="green"></rect>
<rect x="0" y="100" width="100" height="50" fill="green"></rect>
</svg>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,39 @@

<head>
<meta charset="UTF-8">
<link rel="match" href="display-none-mask-ref.html" />
<title>Mask behaviour when mask image is missing or display:none</title>
<link rel="match" href="display-none-mask-ref.html">
<link name="author" title="Timothy Nikkel" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1624532">
<link name="author" title="Mike Bremford" href="http://bfo.com"> <!-- edited 202010 -->
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-mask-image">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#MaskElement">
<link rel="help" href="https://github.com/w3c/fxtf-drafts/issues/245">
<meta name="assert" content="A missing or invalid mask image is equivalent to transparent black (i.e. nothing is displayed). A mask with display:none is disabled (which is a change to the specified behaviour as of issue 245)">
</head>

<body>
<svg width="200" height="200">
<!-- missing/invalid mask is equivalent to transparent black - nothing displayed -->
<foreignObject x="0" y="0" width="200" height="200" style="mask: url('#notfound');">
<div style="width: 200px; height: 200px; background: red"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<!-- display:none on mask means mask is not applied (new in https://github.com/w3c/fxtf-drafts/issues/245) -->
<foreignObject x="0" y="0" width="200" height="200" style="mask: url('#noneMask');">
<div style="width: 200px; height: 200px; background: red"></div>
<div style="width: 200px; height: 200px; background: green"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<!-- missing/invalid mask is equivalent to transparent black - nothing displayed -->
<div style="width: 200px; height: 200px; background: red; mask: url('#notfound');"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: red; mask: url('#noneMask');"></div>
<!-- display:none on mask means mask is not applied (new in https://github.com/w3c/fxtf-drafts/issues/245) -->
<div style="width: 200px; height: 200px; background: green; mask: url('#noneMask');"></div>
</foreignobject>
</svg>

Expand All @@ -45,24 +56,24 @@
</mask>
</defs>
<foreignObject x="0" y="0" width="200" height="200" style="mask: url('#aMask');">
<div style="width: 200px; height: 200px; background: red;"></div>
<div style="width: 200px; height: 200px; background: green;"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: red; mask: url('#aMask');"></div>
<div style="width: 200px; height: 200px; background: green; mask: url('#aMask');"></div>
</foreignobject>
</svg>

<!-- make sure masking works on active content -->
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200" style="mask: url('#aMask');">
<div style="width: 200px; height: 200px; background: red; will-change: transform"></div>
<div style="width: 200px; height: 200px; background: green; will-change: transform"></div>
</foreignobject>
</svg>
<svg width="200" height="200">
<foreignObject x="0" y="0" width="200" height="200">
<div style="width: 200px; height: 200px; background: red; will-change: transform; mask: url('#aMask');"></div>
<div style="width: 200px; height: 200px; background: green; will-change: transform; mask: url('#aMask');"></div>
</foreignobject>
</svg>
</body>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!DOCTYPE html>
<div style="width: 100px; height: 100px; background-color: green"></div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<title>Marker on implicit subpath</title>
<link rel="help" href="https://svgwg.org/svg2-draft/painting.html#RenderingMarkers">
<link rel="help" href="https://svgwg.org/svg2-draft/paths.html#PathDataClosePathCommand">
<link rel="match" href="../../struct/reftests/reference/green-100x100.html">
<svg width="400" viewBox="-200 0 400 150">
<marker id="m" markerUnits="userSpaceOnUse" orient="auto" overflow="visible">
<rect width="100" height="100" fill="green"/>
</marker>
<rect x="-200" width="100" height="100" fill="red"/>
<path d="M-200,0ZZZ" marker-mid="url(#m)" stroke="red" stroke-width="4"/>
</svg>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e432d40

Please sign in to comment.