diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-19 20:51:18 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-19 20:51:18 +0530 |
| commit | 3d4416e1b0ae758e68900f725979238cc0128f8b (patch) | |
| tree | f4cbbb256d2a4bab87693bd0a02a5e9e74e8b3cd | |
| parent | a7c885706ec4bd526b00ecad5d870415ae6cc1e1 (diff) | |
| parent | 77f52d2eab66693684d9ecf53ffd4ddfc107f5e5 (diff) | |
| download | servo-3d4416e1b0ae758e68900f725979238cc0128f8b.tar.gz servo-3d4416e1b0ae758e68900f725979238cc0128f8b.zip | |
Auto merge of #10634 - amarant:10574-image-document-base, r=metajack
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
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10634)
<!-- Reviewable:end -->
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 c0b7754098d..941af86cd95 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -37341,6 +37341,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", @@ -40555,6 +40567,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 |
