Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10634 - amarant:10574-image-document-base, r=metajack

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-04-19 20:51:18 +05:30
commit 3d4416e1b0
5 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/htmlimageelement.rs
View file

@ -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())
}));
},
_ => {},

24
tests/wpt/metadata/MANIFEST.json
View file

@ -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"
}
]
}
},

5
tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html Normal file
View file

@ -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">

7
tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url.html Normal file
View file

@ -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">

BIN
tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB