diff --git a/Cargo.lock b/Cargo.lock index 0ce2361bb07..a0c28258043 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1945,9 +1945,9 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "data-url" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" +checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" [[package]] name = "dbus" diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index c7bbe2d4465..058ea99bc8f 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -198,7 +198,7 @@ use crate::fetch::FetchCanceller; use crate::iframe_collection::IFrameCollection; use crate::image_animation::ImageAnimationManager; use crate::messaging::{CommonScriptMsg, MainThreadScriptMsg}; -use crate::mime::{APPLICATION, CHARSET, MimeExt}; +use crate::mime::{APPLICATION, CHARSET}; use crate::network_listener::{NetworkListener, PreInvoke}; use crate::realms::{AlreadyInRealm, InRealm, enter_realm}; use crate::script_runtime::{CanGc, ScriptThreadEventCategory}; diff --git a/components/script/mime.rs b/components/script/mime.rs index 8d45e84252a..74209579fc7 100644 --- a/components/script/mime.rs +++ b/components/script/mime.rs @@ -13,13 +13,6 @@ pub(crate) static XML: &str = "xml"; /// Convenience methods to make the data_url Mime type more ergonomic. pub(crate) trait MimeExt { - /// Creates a new Mime from type and subtype, without any parameter. - fn new(type_: &str, subtype: &str) -> Self; - - /// Checks that this Mime matches a given type and subtype, ignoring - /// parameters. - fn matches(&self, type_: &str, subtype: &str) -> bool; - /// Checks that the subtype has a given suffix. /// Eg. image/svg+xml has the the xml suffix. fn has_suffix(&self, suffix: &str) -> bool; @@ -32,18 +25,6 @@ pub(crate) trait MimeExt { } impl MimeExt for Mime { - fn new(type_: &str, subtype: &str) -> Self { - Mime { - type_: type_.into(), - subtype: subtype.into(), - parameters: vec![], - } - } - - fn matches(&self, type_: &str, subtype: &str) -> bool { - self.type_ == type_ && self.subtype == subtype - } - fn has_suffix(&self, suffix: &str) -> bool { self.subtype.ends_with(&format!("+{}", suffix)) } diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-width-auto-006.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-width-auto-006.html.ini deleted file mode 100644 index 12c787e0b25..00000000000 --- a/tests/wpt/meta/css/css-flexbox/flexbox-min-width-auto-006.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox-min-width-auto-006.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html.ini new file mode 100644 index 00000000000..11f47a434cf --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html.ini @@ -0,0 +1,2 @@ +[grid-item-aspect-ratio-stretch-1.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html.ini new file mode 100644 index 00000000000..d0bd55478eb --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html.ini @@ -0,0 +1,2 @@ +[grid-item-aspect-ratio-stretch-2.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html.ini new file mode 100644 index 00000000000..1866d16952b --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html.ini @@ -0,0 +1,2 @@ +[grid-item-no-aspect-ratio-stretch-2.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html.ini new file mode 100644 index 00000000000..d48000be7d1 --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html.ini @@ -0,0 +1,2 @@ +[grid-item-no-aspect-ratio-stretch-3.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html.ini new file mode 100644 index 00000000000..2b551dbabca --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html.ini @@ -0,0 +1,2 @@ +[grid-item-no-aspect-ratio-stretch-4.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html.ini new file mode 100644 index 00000000000..f71f9efe3c5 --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html.ini @@ -0,0 +1,2 @@ +[grid-item-no-aspect-ratio-stretch-5.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html.ini new file mode 100644 index 00000000000..9ee9cce78ad --- /dev/null +++ b/tests/wpt/meta/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html.ini @@ -0,0 +1,2 @@ +[grid-item-no-aspect-ratio-stretch-6.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-with-dynamic-img.html.ini b/tests/wpt/meta/css/css-grid/grid-with-dynamic-img.html.ini deleted file mode 100644 index bd5f7c04c7c..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-with-dynamic-img.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-with-dynamic-img.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html.ini b/tests/wpt/meta/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html.ini deleted file mode 100644 index fbcd9a83b13..00000000000 --- a/tests/wpt/meta/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[position-absolute-replaced-intrinsic-size.tentative.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-position/position-absolute-replaced-minmax.html.ini b/tests/wpt/meta/css/css-position/position-absolute-replaced-minmax.html.ini index 2a1431da4a4..a8ea63dd7b3 100644 --- a/tests/wpt/meta/css/css-position/position-absolute-replaced-minmax.html.ini +++ b/tests/wpt/meta/css/css-position/position-absolute-replaced-minmax.html.ini @@ -44,14 +44,5 @@ [minmax replaced IMG 37] expected: FAIL - [minmax replaced IMG 38] - expected: FAIL - [minmax replaced IMG 39] expected: FAIL - - [minmax replaced IMG 40] - expected: FAIL - - [minmax replaced IMG 41] - expected: FAIL diff --git a/tests/wpt/meta/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html.ini b/tests/wpt/meta/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html.ini deleted file mode 100644 index 23af5ed6480..00000000000 --- a/tests/wpt/meta/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[position-absolute-replaced-no-intrinsic-size.tentative.html] - expected: FAIL diff --git a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.tentative.sub.html.ini b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.tentative.sub.html.ini index 5af5dc2813d..7f912d09db0 100644 --- a/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.tentative.sub.html.ini +++ b/tests/wpt/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.tentative.sub.html.ini @@ -1,7 +1,4 @@ [dangling-markup-mitigation-data-url.tentative.sub.html] - [] - expected: FAIL - [] expected: FAIL