diff options
| author | Arnaud Marant <arnaudmarant@gmail.com> | 2016-04-15 21:11:58 +0200 |
|---|---|---|
| committer | Arnaud Marant <arnaudmarant@gmail.com> | 2016-04-15 21:37:25 +0200 |
| commit | 77f52d2eab66693684d9ecf53ffd4ddfc107f5e5 (patch) | |
| tree | 6b82d18bf7aac049780e2185c9a46e7136ee2409 | |
| parent | 44d7657487797575bb47aa295a13b496dd2cd69c (diff) | |
| download | servo-77f52d2eab66693684d9ecf53ffd4ddfc107f5e5.tar.gz servo-77f52d2eab66693684d9ecf53ffd4ddfc107f5e5.zip | |
Issue #10574 Use the document base url in img
add a test with base path set to the resources path and an img with a cat and the reference directly to the image
5 files changed, 37 insertions, 1 deletions
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 92291600ca3..c0a9e960385 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -369,7 +369,7 @@ impl VirtualMethods for HTMLImageElement { &atom!("src") => { self.update_image(mutation.new_value(attr).map(|value| { // FIXME(ajeffrey): convert directly from AttrValue to DOMString - (DOMString::from(&**value), window_from_node(self).get_url()) + (DOMString::from(&**value), document_from_node(self).base_url()) })); }, _ => {}, diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 31ec16b06d5..ae81304687a 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -37329,6 +37329,18 @@ "url": "/html/semantics/embedded-content/the-iframe-element/iframe-with-base.html" } ], + "html/semantics/embedded-content/the-img-element/document-base-url.html": [ + { + "path": "html/semantics/embedded-content/the-img-element/document-base-url.html", + "references": [ + [ + "/html/semantics/embedded-content/the-img-element/document-base-url-ref.html", + "==" + ] + ], + "url": "/html/semantics/embedded-content/the-img-element/document-base-url.html" + } + ], "html/semantics/embedded-content/the-video-element/video_content_image.htm": [ { "path": "html/semantics/embedded-content/the-video-element/video_content_image.htm", @@ -40525,6 +40537,18 @@ ], "url": "/html/semantics/embedded-content/the-iframe-element/iframe-with-base.html" } + ], + "html/semantics/embedded-content/the-img-element/document-base-url.html": [ + { + "path": "html/semantics/embedded-content/the-img-element/document-base-url.html", + "references": [ + [ + "/html/semantics/embedded-content/the-img-element/document-base-url-ref.html", + "==" + ] + ], + "url": "/html/semantics/embedded-content/the-img-element/document-base-url.html" + } ] } }, diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html new file mode 100644 index 00000000000..6e55b21ff0b --- /dev/null +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html @@ -0,0 +1,5 @@ +<!DOCTYPE HTML> +<meta charset="utf-8"> +<title>Document base URL img test</title> +<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-img-element" /> +<img src="resources/cat.jpg" alt="cat"> diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url.html new file mode 100644 index 00000000000..074209cc04a --- /dev/null +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url.html @@ -0,0 +1,7 @@ +<!DOCTYPE HTML> +<meta charset="utf-8"> +<title>Document base URL img test</title> +<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-img-element" /> +<link rel="match" href="document-base-url-ref.html"> +<base href="resources/" /> +<img src="cat.jpg" alt="cat"> diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg Binary files differnew file mode 100644 index 00000000000..a4f14f54d60 --- /dev/null +++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg |
