diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2017-01-27 12:33:20 +0100 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-01-30 12:43:49 +0100 |
| commit | 69e31730479fbe9afda715f2c146b44562143316 (patch) | |
| tree | c0a74918b2598351394301a498afd670fc198eec | |
| parent | c853337d644757c4b09d18dd7c0b2f90ea0de442 (diff) | |
| download | servo-69e31730479fbe9afda715f2c146b44562143316.tar.gz servo-69e31730479fbe9afda715f2c146b44562143316.zip | |
Always set the Document::contentType attribute in ScriptThread::load().
There's no good reason to limit this to a few particular content types.
7 files changed, 3 insertions, 39 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 7af80f5f7fc..ae9db34c134 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -1718,15 +1718,9 @@ impl ScriptThread { headers.get().map(|&LastModified(HttpDate(ref tm))| dom_last_modified(tm)) }); - let content_type = metadata.content_type.as_ref().and_then(|&Serde(ContentType(ref mimetype))| { - match *mimetype { - Mime(TopLevel::Application, SubLevel::Xml, _) | - Mime(TopLevel::Application, SubLevel::Ext(_), _) | - Mime(TopLevel::Text, SubLevel::Xml, _) | - Mime(TopLevel::Text, SubLevel::Plain, _) => Some(DOMString::from(mimetype.to_string())), - _ => None, - } - }); + let content_type = metadata.content_type + .as_ref() + .map(|&Serde(ContentType(ref mimetype))| DOMString::from(mimetype.to_string())); let loader = DocumentLoader::new_with_threads(self.resource_threads.clone(), Some(final_url.clone())); diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini deleted file mode 100644 index c9fe16b47ac..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[contenttype_bmp.html] - type: testharness - [BMP document.contentType === 'image/bmp'] - expected: FAIL - diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini deleted file mode 100644 index 6ee7cfc6534..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[contenttype_css.html] - type: testharness - [CSS document.contentType === 'text/css'] - expected: FAIL - diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini deleted file mode 100644 index c7406033956..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[contenttype_gif.html] - type: testharness - [GIF document.contentType === 'image/gif'] - expected: FAIL - diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini deleted file mode 100644 index a26f723b426..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[contenttype_jpg.html] - type: testharness - [JPG document.contentType === 'image/jpeg'] - expected: FAIL - diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini deleted file mode 100644 index 29d76f88d2f..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[contenttype_png.html] - type: testharness - [PNG document.contentType === 'image/png'] - expected: FAIL - diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini deleted file mode 100644 index a285ed1a1e3..00000000000 --- a/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pageload-image.html] - type: testharness - [The document for a standalone media file should have one child in the body.] - expected: FAIL - |