diff options
9 files changed, 7 insertions, 43 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index e1e07fd177e..865fd389330 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -1710,15 +1710,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 - diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html index 52151b8deb7..1f9c084fd00 100644 --- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html +++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html @@ -13,6 +13,7 @@ function frameLoaded() { var testframe = document.getElementById('testframe'); + assert_equals(testframe.contentDocument.contentType, "image/png"); var testframeChildren = testframe.contentDocument.body.childNodes; assert_equals(testframeChildren.length, 1, "Body of image document has 1 child"); assert_equals(testframeChildren[0].nodeName, "IMG", "Only child of body must be an <img> element"); @@ -24,7 +25,6 @@ </head> <body> <div id="log"></div> - <iframe id="testframe" onload="t.step(frameLoaded)" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9oMFgQGMyFwHucAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAADElEQVQI12P4//8/AAX+Av7czFnnAAAAAElFTkSuQmCC"></iframe> + <iframe id="testframe" onload="t.step(frameLoaded)" src="/images/blue.png"></iframe> </body> </html> diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html index 13bc5db4a43..69ef7413b38 100644 --- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html +++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html @@ -13,6 +13,7 @@ function frameLoaded() { var testframe = document.getElementById('testframe'); + assert_equals(testframe.contentDocument.contentType, "video/webm"); var testframeChildren = testframe.contentDocument.body.childNodes; assert_equals(testframeChildren.length, 1, "Body of image document has 1 child"); assert_equals(testframeChildren[0].nodeName, "VIDEO", "Only child of body must be an <video> element"); @@ -24,7 +25,6 @@ </head> <body> <div id="log"></div> - <iframe id="testframe" onload="t.step(frameLoaded)" - src="data:video/webm,"></iframe> + <iframe id="testframe" onload="t.step(frameLoaded)" src="/media/white.webm"></iframe> </body> </html> |