Skip to content

Commit

Permalink
Auto merge of #22552 - servo-wpt-sync:wpt_update_24-12-2018, r=jdm
Browse files Browse the repository at this point in the history
Sync WPT with upstream (24-12-2018)

Automated downstream sync of changes from upstream as of 24-12-2018.
[no-wpt-sync]

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22552)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Dec 25, 2018
2 parents 5ccd912 + 4be16c7 commit 47a308b
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 13 deletions.
19 changes: 19 additions & 0 deletions tests/wpt/metadata/MANIFEST.json
Original file line number Diff line number Diff line change
Expand Up @@ -295601,6 +295601,11 @@
{}
]
],
"html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.py": [
[
{}
]
],
"html/semantics/embedded-content/the-img-element/available-images-ref.html": [
[
{}
Expand Down Expand Up @@ -372530,6 +372535,12 @@
{}
]
],
"html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html": [
[
"/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html",
{}
]
],
"html/semantics/embedded-content/the-img-element/Image-constructor.html": [
[
"/html/semantics/embedded-content/the-img-element/Image-constructor.html",
Expand Down Expand Up @@ -627205,6 +627216,14 @@
"d30ac2ac36c66bf735036baa755f836b00fa47a6",
"support"
],
"html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html": [
"73b937f67fd7e0ccce22391e9c28eef334addc88",
"testharness"
],
"html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.py": [
"e4216c6d53fd4cb66be3870b3ea6b590af27fb2c",
"support"
],
"html/semantics/embedded-content/the-img-element/Image-constructor.html": [
"aa838ec8774e2bcaac360bf8ed929e0facc7fa3e",
"testharness"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[traverse_the_history_3.html]
[traverse_the_history_5.html]
[Multiple history traversals, last would be aborted]
expected: FAIL

Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
expected: NOTRUN

[calling play() on a sufficiently long video should trigger timeupdate event]
expected: NOTRUN
expected: FAIL

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[404-response-with-actual-image-data.html]
[404 response with actual image data should be rendered and load event is fired]
expected: FAIL

Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
expected: TIMEOUT

[picture: source (max-width:500px) valid image, img broken image, resize to narrow]
expected: FAIL
expected: TIMEOUT

[picture: source (max-width:500px) valid image, img valid image, resize to narrow]
expected: FAIL
expected: TIMEOUT

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[toggleEvent.html]
[Calling open twice on 'details' fires only one toggle event]
expected: FAIL

[Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
expected: FAIL

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
[Verifies the resolution of entry.startTime is at least 5 microseconds.]
expected: TIMEOUT

[Verifies the resolution of performance.now() is at least 5 microseconds.]
expected: FAIL

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[buffer-full-set-to-current-buffer.html]
expected: ERROR
[Test that entries added and event firing happened in the right sequence]
expected: TIMEOUT
expected: FAIL

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!DOCTYPE HTML>
<meta charset="utf-8">
<title>404 response with actual image data should be rendered and load event is fired</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>

<img id="img">

<script>
async_test(t => {
var img = document.getElementById("img");
img.onload = t.step_func_done(e => {
assert_equals(e.type, "load", "image.onload() called");
});
img.onerror = t.unreached_func("image.onerror() was not supposed to be called");
img.src = "404-response-with-actual-image-data.py";
}, "404 response with actual image data should be rendered and load event is fired");
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import base64
def main(req, res):
return 404, [('Content-Type', 'image/png')], base64.decodestring("iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAhSURBVDhPY3wro/KfgQLABKXJBqMGjBoAAqMGDLwBDAwAEsoCTFWunmQAAAAASUVORK5CYII=")

0 comments on commit 47a308b

Please sign in to comment.