From 43b72537dcbd8770f48fc2a92612b44717d809c1 Mon Sep 17 00:00:00 2001 From: Maciej Skrzypkowski Date: Fri, 6 May 2016 12:41:27 +0200 Subject: [PATCH] Update cssparser to fix CSS.escape test failures Fixed failing tests #10685 --- components/script/dom/css.rs | 5 +---- components/servo/Cargo.lock | 18 +++++++++--------- ports/cef/Cargo.lock | 16 ++++++++-------- ports/geckolib/Cargo.lock | 10 +++++----- ports/gonk/Cargo.lock | 16 ++++++++-------- .../cssom-1_dev/html/escape.htm.ini | 9 --------- 6 files changed, 31 insertions(+), 43 deletions(-) diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs index e1d2917084e1..d53a94e5da29 100644 --- a/components/script/dom/css.rs +++ b/components/script/dom/css.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use cssparser::serialize_identifier; -use dom::bindings::error::{Error, Fallible}; +use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::reflector::Reflector; use util::str::DOMString; @@ -16,9 +16,6 @@ pub struct CSS { impl CSS { // http://dev.w3.org/csswg/cssom/#serialize-an-identifier pub fn Escape(_: GlobalRef, ident: DOMString) -> Fallible { - if ident.bytes().any(|b| b == b'\0') { - return Err(Error::InvalidCharacter); - } let mut escaped = String::new(); serialize_identifier(&ident, &mut escaped).unwrap(); Ok(DOMString::from(escaped)) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index c35ccad86ff5..318b0b8a6ed1 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -215,7 +215,7 @@ name = "canvas_traits" version = "0.0.1" dependencies = [ "azure 0.4.4 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -404,7 +404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1106,7 +1106,7 @@ dependencies = [ "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1315,7 +1315,7 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1834,7 +1834,7 @@ dependencies = [ "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1923,7 +1923,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2109,7 +2109,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2137,7 +2137,7 @@ name = "style_tests" version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", @@ -2154,7 +2154,7 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 0eb2b2bfada7..adaf50bfec86 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -201,7 +201,7 @@ name = "canvas_traits" version = "0.0.1" dependencies = [ "azure 0.4.4 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -375,7 +375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1027,7 +1027,7 @@ dependencies = [ "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1229,7 +1229,7 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1703,7 +1703,7 @@ dependencies = [ "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1781,7 +1781,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2003,7 +2003,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2030,7 +2030,7 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 88baff9a4b76..617a8a508cd5 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -3,7 +3,7 @@ name = "geckoservo" version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -97,7 +97,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -464,7 +464,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -522,7 +522,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -549,7 +549,7 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 09feef56bbb0..0d0d6fc88d0c 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -194,7 +194,7 @@ name = "canvas_traits" version = "0.0.1" dependencies = [ "azure 0.4.4 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -368,7 +368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1010,7 +1010,7 @@ dependencies = [ "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1212,7 +1212,7 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1686,7 +1686,7 @@ dependencies = [ "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1764,7 +1764,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1984,7 +1984,7 @@ version = "0.0.1" dependencies = [ "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2011,7 +2011,7 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini b/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini index ca3b93d8303d..4130c045a50e 100644 --- a/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini +++ b/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini @@ -1,14 +1,5 @@ [escape.htm] type: testharness - [Null bytes] - expected: FAIL - bug: https://github.com/servo/servo/issues/10685 - - [Various tests] - expected: FAIL - bug: https://github.com/servo/servo/issues/10685 - [Surrogates] expected: FAIL bug: https://github.com/servo/servo/issues/6564 -