From 81306a095b210295a1922d51441e4a1a1b7a4e2d Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Wed, 21 Oct 2015 15:48:12 -0700 Subject: [PATCH] Update rust-selectors to tip. --- components/layout/wrapper.rs | 5 +++++ components/script/dom/element.rs | 5 +++++ components/servo/Cargo.lock | 16 ++++++++-------- ports/cef/Cargo.lock | 14 +++++++------- ports/gonk/Cargo.lock | 14 +++++++------- .../nodes/ParentNode-querySelector-All.html.ini | 12 ------------ .../meta/css/last_of_type_pseudo_a.html.ini | 3 +++ 7 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 tests/wpt/mozilla/meta/css/last_of_type_pseudo_a.html.ini diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index e2c0bd89f190..7478d11e77ae 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -470,6 +470,11 @@ impl<'le> ::selectors::Element for LayoutElement<'le> { self.element.get_event_state_for_layout().contains(element::IN_FOCUS_STATE) } + // FIXME(#7720) + fn get_target_state(&self) -> bool { + false + } + #[inline] fn get_active_state(&self) -> bool { self.element.get_event_state_for_layout().contains(element::IN_ACTIVE_STATE) diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index f0d078fbaf1b..9bc8e2dd0b38 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1659,6 +1659,11 @@ impl<'a> ::selectors::Element for Root { Element::get_focus_state(self) } + // FIXME(#7720) + fn get_target_state(&self) -> bool { + false + } + fn get_id(&self) -> Option { self.id_attribute.borrow().clone() } diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index a2844fb225a5..e006ad11f3b7 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1022,7 +1022,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", "script_traits 0.0.1", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1529,7 +1529,7 @@ dependencies = [ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1574,8 +1574,8 @@ dependencies = [ [[package]] name = "selectors" -version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#1e1e44c2f4090e8beb95a8d27f184aefcf91a362" +version = "0.1.1" +source = "git+https://github.com/servo/rust-selectors#a7ec94aac09a3f14413a7cdcb894ddf11b3a3319" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1732,7 +1732,7 @@ dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1750,7 +1750,7 @@ dependencies = [ "app_units 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -1770,7 +1770,7 @@ dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1915,7 +1915,7 @@ dependencies = [ "plugins 0.0.1", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index f2e136e26910..71f8b512cef7 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -972,7 +972,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", "script_traits 0.0.1", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1461,7 +1461,7 @@ dependencies = [ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1498,8 +1498,8 @@ dependencies = [ [[package]] name = "selectors" -version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#1e1e44c2f4090e8beb95a8d27f184aefcf91a362" +version = "0.1.1" +source = "git+https://github.com/servo/rust-selectors#a7ec94aac09a3f14413a7cdcb894ddf11b3a3319" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1688,7 +1688,7 @@ dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1710,7 +1710,7 @@ dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1855,7 +1855,7 @@ dependencies = [ "plugins 0.0.1", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index a51703114067..25750b311647 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -852,7 +852,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", "script_traits 0.0.1", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1323,7 +1323,7 @@ dependencies = [ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1360,8 +1360,8 @@ dependencies = [ [[package]] name = "selectors" -version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#1e1e44c2f4090e8beb95a8d27f184aefcf91a362" +version = "0.1.1" +source = "git+https://github.com/servo/rust-selectors#a7ec94aac09a3f14413a7cdcb894ddf11b3a3319" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1530,7 +1530,7 @@ dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1552,7 +1552,7 @@ dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1686,7 +1686,7 @@ dependencies = [ "plugins 0.0.1", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "selectors 0.1.1 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini b/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini index a9382886b5ef..12748900b123 100644 --- a/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini +++ b/tests/wpt/metadata/dom/nodes/ParentNode-querySelector-All.html.ini @@ -72,12 +72,6 @@ [Detached Element.querySelector: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]] expected: FAIL - [Detached Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target] - expected: FAIL - - [Detached Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target] - expected: FAIL - [Detached Element.querySelectorAll: :lang pseudo-class selector, not matching element with no inherited language: #pseudo-lang-div1:lang(en)] expected: FAIL @@ -132,12 +126,6 @@ [Fragment.querySelector: Attribute whitespace-separated list selector, not matching class attribute with empty value: #attr-whitespace [class~=""\]] expected: FAIL - [Fragment.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target] - expected: FAIL - - [Fragment.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target] - expected: FAIL - [Fragment.querySelectorAll: :lang pseudo-class selector, not matching element with no inherited language: #pseudo-lang-div1:lang(en)] expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/last_of_type_pseudo_a.html.ini b/tests/wpt/mozilla/meta/css/last_of_type_pseudo_a.html.ini new file mode 100644 index 000000000000..9f9c708eb6bf --- /dev/null +++ b/tests/wpt/mozilla/meta/css/last_of_type_pseudo_a.html.ini @@ -0,0 +1,3 @@ +[last_of_type_pseudo_a.html] + type: reftest + expected: FAIL