Modified: trunk/LayoutTests/imported/w3c/ChangeLog (219419 => 219420)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-07-12 20:19:44 UTC (rev 219419)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-07-12 20:21:34 UTC (rev 219420)
@@ -1,3 +1,18 @@
+2017-07-12 Ali Juma <aj...@chromium.org>
+
+ Update web platform tests for elementFromPoint and elementsFromPoint
+ https://bugs.webkit.org/show_bug.cgi?id=174391
+
+ Reviewed by Youenn Fablet.
+
+ This updates tests to include changes made upstream in
+ https://github.com/w3c/web-platform-tests/pull/6349. These changes make the tests
+ fit within the 800x600 window size used in layout tests.
+
+ * web-platform-tests/cssom-view/elementFromPoint-expected.txt: Updated.
+ * web-platform-tests/cssom-view/elementFromPoint.html: Updated.
+ * web-platform-tests/cssom-view/elementsFromPoint.html: Updated.
+
2017-07-12 Matt Lewis <jlew...@apple.com>
Unreviewed, rolling out r219401.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementFromPoint-expected.txt (219419 => 219420)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementFromPoint-expected.txt 2017-07-12 20:19:44 UTC (rev 219419)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementFromPoint-expected.txt 2017-07-12 20:21:34 UTC (rev 219420)
@@ -1,7 +1,7 @@
-Hello WPT!
+Hello!
Another teal
@@ -17,5 +17,5 @@
PASS No viewport available
FAIL Image Maps assert_equals: Should have returned the area element expected Element node <area id="rectG" shape="rect" coords="0,0,90,100" href="" but got Element node <html><head><title>cssom-view - elementFromPoint</title>
...
-FAIL Fieldsets assert_equals: The fieldset should not cover up the div it doesn't even overlap expected Element node <div id="fieldset-div" class="size" style="position: abso... but got null
+PASS Fieldsets
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementFromPoint.html (219419 => 219420)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementFromPoint.html 2017-07-12 20:19:44 UTC (rev 219419)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementFromPoint.html 2017-07-12 20:21:34 UTC (rev 219420)
@@ -4,12 +4,12 @@
<script src=""
<style>
.size {
- width:100px;
- height:100px;
+ width:60px;
+ height:60px;
}
.overlay {
position:absolute;
- top:109px;
+ top:69px;
pointer-events:none;
}
.purple {
@@ -32,26 +32,27 @@
<iframe id=iframe-1 src="" style='display:none;position:absolute; left:300px;'></iframe>
<iframe id=iframe-2 src="" width="" height=""></iframe>
<iframe id=iframe-3 width="" height=""></iframe>
- <svg id=squiggle xmlns="http://www.w3.org/2000/svg" height="98" width="581" viewBox="0 0 581 98">
+ <svg id=squiggle xmlns="http://www.w3.org/2000/svg" height="98" width="500" viewBox="0 0 581 98">
<path stroke-dashoffset="0.00" stroke-dasharray="" d="M62.9 14.9c-25-7.74-56.6 4.8-60.4 24.3-3.73 19.6 21.6 35 39.6 37.6 42.8 6.2 72.9-53.4 116-58.9 65-18.2 191 101 215 28.8 5-16.7-7-49.1-34-44-34 11.5-31 46.5-14 69.3 9.38 12.6 24.2 20.6 39.8 22.9 91.4 9.05 102-98.9 176-86.7 18.8 3.81 33 17.3 36.7 34.6 2.01 10.2.124 21.1-5.18 30.1" stroke="#000" stroke-width="4.3" fill="none">
</path>
</svg>
- <svg id=svg-transform width="180" height="200"
+ <svg id=svg-transform width="180" height="140"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Now we add a text element and apply rotate and translate to both -->
- <rect x="50" y="50" height="100" width="100" style="stroke:#000; fill: #0086B2" transform="translate(30) rotate(45 50 50)"></rect>
- <text x="60" y="105" transform="translate(30) rotate(45 50 50)"> Hello WPT! </text>
+ <rect x="50" y="50" height="60" width="60" style="stroke:#000; fill: #0086B2" transform="translate(30) rotate(45 50 50)"></rect>
+ <text x="60" y="105" transform="translate(30) rotate(45 50 50)"> Hello! </text>
</svg>
<div id='pink' class='size pink' style='transform: translate(10px)'> </div>
<div id='anotherteal' class='size teal' style='pointer-events:none'>Another teal</div>
- <img id="dinos" src="" usemap="" border="0" width="364" height="126"/>
+ <img id="dinos" src="" usemap="" border="0" width="364" height="40"/>
<map id="dinos_map" name="dinos_map">
- <area id="rectG" shape="rect" coords="0,0,90,100" href="" alt="area 1"/>
- <area id="circleO" shape="circle" coords="120,60,30" href="" alt="area 2"/>
- <area id="polyLE" shape="poly" coords="280,0,310,0,360,30,360,90,280,90" href="" alt="area 3"/>
+ <area id="rectG" shape="rect" coords="0,0,90,100" href="" alt="area 1"/>
+ <area id="circleO" shape="circle" coords="120,60,30" href="" alt="area 2"/>
+ <area id="polyLE" shape="poly" coords="280,0,310,0,360,30,360,90,280,90" href="" alt="area 3"/>
+ </map>
<!-- Test for fieldsets not doing weird things. Use a 200x200 div to hold
all the bits for this test. Also, place it top/right, so it is not below
the bottom edge of the viewport. -->
@@ -109,7 +110,7 @@
}, "Return first element that is the target for hit testing");
test(function () {
- assert_equals(document.elementFromPoint(10, 120), document.getElementById('yellow'),
+ assert_equals(document.elementFromPoint(10, 80), document.getElementById('yellow'),
"Should have returned the element with id `yellow` as element with `teal` has `pointer-events:none`");
}, "First element to get mouse events with pointer-events css");
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementsFromPoint.html (219419 => 219420)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementsFromPoint.html 2017-07-12 20:19:44 UTC (rev 219419)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cssom-view/elementsFromPoint.html 2017-07-12 20:21:34 UTC (rev 219420)
@@ -4,12 +4,12 @@
<script src=""
<style>
.size {
- width:100px;
- height:100px;
+ width:60px;
+ height:60px;
}
.overlay {
position:absolute;
- top:109px;
+ top:69px;
pointer-events:none;
}
.purple {
@@ -32,17 +32,17 @@
<iframe id=iframe-1 src="" style='display:none;position:absolute; left:300px;'></iframe>
<iframe id=iframe-2 src="" width="" height=""></iframe>
<iframe id=iframe-3 width="" height=""></iframe>
- <svg id=squiggle xmlns="http://www.w3.org/2000/svg" height="98" width="581" viewBox="0 0 581 98">
+ <svg id=squiggle xmlns="http://www.w3.org/2000/svg" height="98" width="500" viewBox="0 0 581 98">
<path stroke-dashoffset="0.00" stroke-dasharray="" d="M62.9 14.9c-25-7.74-56.6 4.8-60.4 24.3-3.73 19.6 21.6 35 39.6 37.6 42.8 6.2 72.9-53.4 116-58.9 65-18.2 191 101 215 28.8 5-16.7-7-49.1-34-44-34 11.5-31 46.5-14 69.3 9.38 12.6 24.2 20.6 39.8 22.9 91.4 9.05 102-98.9 176-86.7 18.8 3.81 33 17.3 36.7 34.6 2.01 10.2.124 21.1-5.18 30.1" stroke="#000" stroke-width="4.3" fill="none">
</path>
</svg>
- <svg id=svg-transform width="180" height="200"
+ <svg id=svg-transform width="180" height="140"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Now we add a text element and apply rotate and translate to both -->
- <rect x="50" y="50" height="100" width="100" style="stroke:#000; fill: #0086B2" transform="translate(30) rotate(45 50 50)"></rect>
- <text x="60" y="105" transform="translate(30) rotate(45 50 50)"> Hello WPT! </text>
+ <rect x="50" y="50" height="60" width="60" style="stroke:#000; fill: #0086B2" transform="translate(30) rotate(45 50 50)"></rect>
+ <text x="60" y="105" transform="translate(30) rotate(45 50 50)"> Hello! </text>
</svg>
<div id='pink' class='size pink' style='transform: translate(10px)'> </div>
@@ -90,7 +90,7 @@
}, "Return first element that is the target for hit testing");
test(function () {
- assert_array_equals(document.elementsFromPoint(10, 120),
+ assert_array_equals(document.elementsFromPoint(10, 80),
[document.getElementById('yellow'), document.body, document.querySelector('html')],
"Should have returned a sequence with `[yellow element, document.body, html]`");
}, "First element to get mouse events with pointer-events css");
