Commit d4a5bdf6 authored by Fredrik Söderquist's avatar Fredrik Söderquist Committed by Commit Bot

Adjust wpt/svg/painting/reftests/marker-path-{001,022,023}-ref.svg

marker-path-001-ref.svg:
 The ref did not include the contribution from the viewBox on the
 <marker> in some case. Adjust the markerWidth/Height to make the
 'viewBox' contribution a scale-factor of one. Set 'overflow' to
 'visible' to avoid clipping artifacts.

marker-path-022-ref.svg:
marker-path-023-ref.svg:
 Renders the markers twice - both on the shape itself and as
 "additional" reference markers. Drop the markers from the shape.

Update the expectations for
 wpt/svg/struct/reftests/use-inheritance-001.svg
 wpt/svg/painting/reftests/marker-path-022.svg and
 wpt/svg/painting/reftests/marker-path-023.svg

Bug: 674797, 785246, 1056492
Change-Id: I164fd7a826f8efdb5c5b5cbc486b81906d32a254
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2077719Reviewed-by: default avatarStephen Chenney <schenney@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#745392}
parent 0e591907
...@@ -437,6 +437,13 @@ crbug.com/1048765 [ Mac10.10 ] external/wpt/svg/animations/short-simple-duration ...@@ -437,6 +437,13 @@ crbug.com/1048765 [ Mac10.10 ] external/wpt/svg/animations/short-simple-duration
crbug.com/1052202 external/wpt/svg/linking/scripted/href-mpath-element.html [ Timeout ] crbug.com/1052202 external/wpt/svg/linking/scripted/href-mpath-element.html [ Timeout ]
crbug.com/1052202 external/wpt/svg/linking/scripted/href-animate-element.html [ Timeout ] crbug.com/1052202 external/wpt/svg/linking/scripted/href-animate-element.html [ Timeout ]
crbug.com/785246 external/wpt/svg/struct/reftests/use-inheritance-001.svg [ Failure ]
crbug.com/674797 external/wpt/svg/painting/reftests/marker-path-022.svg [ Failure ]
crbug.com/674797 external/wpt/svg/painting/reftests/marker-path-023.svg [ Failure ]
# Minor pixel differences
crbug.com/1056492 external/wpt/svg/painting/reftests/marker-path-001.svg [ Failure ]
# Slightly flaky timeouts (about 1 in 30) # Slightly flaky timeouts (about 1 in 30)
crbug.com/1050993 [ Linux ] virtual/gpu-rasterization/images/drag-image-descendant-painting-sibling.html [ Crash Pass Timeout ] crbug.com/1050993 [ Linux ] virtual/gpu-rasterization/images/drag-image-descendant-painting-sibling.html [ Crash Pass Timeout ]
...@@ -2936,18 +2943,6 @@ crbug.com/641245 external/wpt/css/motion/offset-path-ray-contain-005.html [ Fail ...@@ -2936,18 +2943,6 @@ crbug.com/641245 external/wpt/css/motion/offset-path-ray-contain-005.html [ Fail
crbug.com/1053965 external/wpt/css/css-values/ex-unit-004.html [ Failure ] crbug.com/1053965 external/wpt/css/css-values/ex-unit-004.html [ Failure ]
# ====== New tests from wpt-importer added here ====== # ====== New tests from wpt-importer added here ======
crbug.com/626703 [ Linux ] external/wpt/svg/struct/reftests/use-inheritance-001.svg [ Failure ]
crbug.com/626703 [ Mac ] external/wpt/svg/struct/reftests/use-inheritance-001.svg [ Failure ]
crbug.com/626703 [ Win ] external/wpt/svg/struct/reftests/use-inheritance-001.svg [ Failure ]
crbug.com/626703 [ Linux ] external/wpt/svg/painting/reftests/marker-path-022.svg [ Failure ]
crbug.com/626703 [ Mac ] external/wpt/svg/painting/reftests/marker-path-022.svg [ Failure ]
crbug.com/626703 [ Win ] external/wpt/svg/painting/reftests/marker-path-022.svg [ Failure ]
crbug.com/626703 [ Linux ] external/wpt/svg/painting/reftests/marker-path-023.svg [ Failure ]
crbug.com/626703 [ Mac ] external/wpt/svg/painting/reftests/marker-path-023.svg [ Failure ]
crbug.com/626703 [ Win ] external/wpt/svg/painting/reftests/marker-path-023.svg [ Failure ]
crbug.com/626703 [ Linux ] external/wpt/svg/painting/reftests/marker-path-001.svg [ Failure ]
crbug.com/626703 [ Mac ] external/wpt/svg/painting/reftests/marker-path-001.svg [ Failure ]
crbug.com/626703 [ Win ] external/wpt/svg/painting/reftests/marker-path-001.svg [ Failure ]
crbug.com/626703 [ Linux ] external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ] crbug.com/626703 [ Linux ] external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ]
crbug.com/626703 [ Mac ] external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ] crbug.com/626703 [ Mac ] external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ]
crbug.com/626703 [ Win ] external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ] crbug.com/626703 [ Win ] external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ]
......
...@@ -14,27 +14,30 @@ ...@@ -14,27 +14,30 @@
<marker id="Start" <marker id="Start"
viewBox="0 0 10 10" refX="0" refY="5" viewBox="0 0 10 10" refX="0" refY="5"
markerUnits="strokeWidth" markerUnits="strokeWidth"
markerWidth="12" markerWidth="10"
markerHeight="9" markerHeight="10"
orient="auto" orient="auto"
overflow="visible"
fill="green"> fill="green">
<path d="M 0 0 L 10 5 L 0 10 z"/> <path d="M 0 0 L 10 5 L 0 10 z"/>
</marker> </marker>
<marker id="Mid" <marker id="Mid"
viewBox="0 0 10 10" refX="0" refY="5" viewBox="0 0 10 10" refX="0" refY="5"
markerUnits="strokeWidth" markerUnits="strokeWidth"
markerWidth="12" markerWidth="10"
markerHeight="9" markerHeight="10"
orient="auto" orient="auto"
overflow="visible"
fill="orange"> fill="orange">
<path d="M 0 0 L 10 5 L 0 10 z"/> <path d="M 0 0 L 10 5 L 0 10 z"/>
</marker> </marker>
<marker id="End" <marker id="End"
viewBox="0 0 10 10" refX="0" refY="5" viewBox="0 0 10 10" refX="0" refY="5"
markerUnits="strokeWidth" markerUnits="strokeWidth"
markerWidth="12" markerWidth="10"
markerHeight="9" markerHeight="10"
orient="auto" orient="auto"
overflow="visible"
fill="blue"> fill="blue">
<path d="M 0 0 L 10 5 L 0 10 z"/> <path d="M 0 0 L 10 5 L 0 10 z"/>
</marker> </marker>
......
...@@ -17,27 +17,30 @@ ...@@ -17,27 +17,30 @@
<marker id="Start" <marker id="Start"
viewBox="0 0 10 10" refX="0" refY="5" viewBox="0 0 10 10" refX="0" refY="5"
markerUnits="strokeWidth" markerUnits="strokeWidth"
markerWidth="12" markerWidth="10"
markerHeight="9" markerHeight="10"
orient="auto" orient="auto"
overflow="visible"
fill="green"> fill="green">
<path d="M 0 0 L 10 5 L 0 10 z"/> <path d="M 0 0 L 10 5 L 0 10 z"/>
</marker> </marker>
<marker id="Mid" <marker id="Mid"
viewBox="0 0 10 10" refX="0" refY="5" viewBox="0 0 10 10" refX="0" refY="5"
markerUnits="strokeWidth" markerUnits="strokeWidth"
markerWidth="12" markerWidth="10"
markerHeight="9" markerHeight="10"
orient="auto" orient="auto"
overflow="visible"
fill="orange"> fill="orange">
<path d="M 0 0 L 10 5 L 0 10 z"/> <path d="M 0 0 L 10 5 L 0 10 z"/>
</marker> </marker>
<marker id="End" <marker id="End"
viewBox="0 0 10 10" refX="0" refY="5" viewBox="0 0 10 10" refX="0" refY="5"
markerUnits="strokeWidth" markerUnits="strokeWidth"
markerWidth="12" markerWidth="10"
markerHeight="9" markerHeight="10"
orient="auto" orient="auto"
overflow="visible"
fill="blue"> fill="blue">
<path d="M 0 0 L 10 5 L 0 10 z"/> <path d="M 0 0 L 10 5 L 0 10 z"/>
</marker> </marker>
......
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
</defs> </defs>
<g id="test-body-reference" style="fill:none;stroke:black;stroke-width:2"> <g id="test-body-reference" style="fill:none;stroke:black;stroke-width:2">
<path d="m 120,100 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z" style="marker-start:url(#Start)"/> <path d="m 120,100 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z"/>
<path d="m 240,100 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z" style="marker-mid:url(#Mid)"/> <path d="m 240,100 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z"/>
<path d="m 360,100 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z" style="marker-end:url(#End)"/> <path d="m 360,100 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z"/>
<path d="m 60,200 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z m 60,60 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z" style="marker-start:url(#Start)"/> <path d="m 60,200 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z m 60,60 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z"/>
<path d="m 200,200 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z m 60,60 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z" style="marker-mid:url(#Mid)"/> <path d="m 200,200 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z m 60,60 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z"/>
<path d="m 340,200 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z m 60,60 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z" style="marker-end:url(#End)"/> <path d="m 340,200 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z m 60,60 c -40,0 -40,0 -40,40 c 0,40 0,40 40,40 c 40,0 40,0 40,-40 c 0,-40 0,-40 -40,-40 z"/>
<!-- Arrows --> <!-- Arrows -->
<path d="m 120,100 -40, 0" style="stroke:none;marker-start:url(#Start)"/> <path d="m 120,100 -40, 0" style="stroke:none;marker-start:url(#Start)"/>
......
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
</defs> </defs>
<g id="test-body-reference" style="fill:none;stroke:black;stroke-width:2"> <g id="test-body-reference" style="fill:none;stroke:black;stroke-width:2">
<path d="m 120,100 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z" style="marker-start:url(#Start)"/> <path d="m 120,100 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z"/>
<path d="m 240,100 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z" style="marker-mid:url(#Mid)"/> <path d="m 240,100 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z"/>
<path d="m 360,100 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z" style="marker-end:url(#End)"/> <path d="m 360,100 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z"/>
<path d="m 60,200 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z m 60,60 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z" style="marker-start:url(#Start)"/> <path d="m 60,200 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z m 60,60 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z"/>
<path d="m 200,200 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z m 60,60 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z" style="marker-mid:url(#Mid)"/> <path d="m 200,200 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z m 60,60 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z"/>
<path d="m 340,200 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z m 60,60 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z" style="marker-end:url(#End)"/> <path d="m 340,200 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z m 60,60 a 40,40 0 0 0 -40,40 a 40,40 0 0 0 40,40 a 40,40 0 0 0 40,-40 a 40,40 0 0 0 -40,-40 z"/>
<!-- Arrows --> <!-- Arrows -->
<path d="m 120,100 -40, 0" style="stroke:none;marker-start:url(#Start)"/> <path d="m 120,100 -40, 0" style="stroke:none;marker-start:url(#Start)"/>
......
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