Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18659 - emilio:unship-stuff, r=xidorn

Browse source 
stylo: unship some stuff.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18659)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-28 03:29:09 -05:00 • committed by GitHub
commit 7574d26476
5 changed files with 905 additions and 1452 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/gecko/generated/bindings.rs
View file

@ -1548,8 +1548,7 @@ extern "C" {
extern "C" { extern "C" {
pub fn Gecko_MatchStringArgPseudo(element: RawGeckoElementBorrowed, pub fn Gecko_MatchStringArgPseudo(element: RawGeckoElementBorrowed,
type_: CSSPseudoClassType, type_: CSSPseudoClassType,
ident: *const u16, ident: *const u16) -> bool;
set_slow_selector: *mut bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AddPropertyToSet(arg1: nsCSSPropertyIDSetBorrowedMut, pub fn Gecko_AddPropertyToSet(arg1: nsCSSPropertyIDSetBorrowedMut,

1174
components/style/gecko/generated/structs_debug.rs
View file

File diff suppressed because it is too large Load diff

1160
components/style/gecko/generated/structs_release.rs
View file

File diff suppressed because it is too large Load diff

6
components/style/gecko/non_ts_pseudo_class_list.rs
View file

@ -59,8 +59,7 @@ macro_rules! apply_non_ts_list {
("-moz-drag-over", MozDragOver, mozDragOver, IN_DRAGOVER_STATE, _), ("-moz-drag-over", MozDragOver, mozDragOver, IN_DRAGOVER_STATE, _),
("target", Target, target, IN_TARGET_STATE, _), ("target", Target, target, IN_TARGET_STATE, _),
("indeterminate", Indeterminate, indeterminate, IN_INDETERMINATE_STATE, _), ("indeterminate", Indeterminate, indeterminate, IN_INDETERMINATE_STATE, _),
// FIXME(emilio): Unship this for content docs (bug 1396073). ("-moz-devtools-highlighted", MozDevtoolsHighlighted, mozDevtoolsHighlighted, IN_DEVTOOLS_HIGHLIGHTED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
("-moz-devtools-highlighted", MozDevtoolsHighlighted, mozDevtoolsHighlighted, IN_DEVTOOLS_HIGHLIGHTED_STATE, _),
// FIXME(emilio): Unship this for content docs (bug 1396073). // FIXME(emilio): Unship this for content docs (bug 1396073).
("-moz-styleeditor-transitioning", MozStyleeditorTransitioning, mozStyleeditorTransitioning, IN_STYLEEDITOR_TRANSITIONING_STATE, _), ("-moz-styleeditor-transitioning", MozStyleeditorTransitioning, mozStyleeditorTransitioning, IN_STYLEEDITOR_TRANSITIONING_STATE, _),
("fullscreen", Fullscreen, fullscreen, IN_FULLSCREEN_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME), ("fullscreen", Fullscreen, fullscreen, IN_FULLSCREEN_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
@ -120,9 +119,6 @@ macro_rules! apply_non_ts_list {
string: [ string: [
// FIXME(emilio): Unship this for content docs (bug 1396066). // FIXME(emilio): Unship this for content docs (bug 1396066).
("-moz-system-metric", MozSystemMetric, mozSystemMetric, _, _), ("-moz-system-metric", MozSystemMetric, mozSystemMetric, _, _),
// FIXME(emilio): Unship this for content docs (bug 1396073).
("-moz-empty-except-children-with-localname", MozEmptyExceptChildrenWithLocalname,
mozEmptyExceptChildrenWithLocalname, _, _),
("lang", Lang, lang, _, _), ("lang", Lang, lang, _, _),
], ],
keyword: [ keyword: [

14
components/style/gecko/wrapper.rs
View file

@ -1970,17 +1970,13 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
} }
NonTSPseudoClass::MozSystemMetric(ref s) | NonTSPseudoClass::MozSystemMetric(ref s) |
NonTSPseudoClass::MozLocaleDir(ref s) | NonTSPseudoClass::MozLocaleDir(ref s) |
NonTSPseudoClass::MozEmptyExceptChildrenWithLocalname(ref s) |
NonTSPseudoClass::Dir(ref s) => { NonTSPseudoClass::Dir(ref s) => {
unsafe { unsafe {
let mut set_slow_selector = false; Gecko_MatchStringArgPseudo(
let matches = Gecko_MatchStringArgPseudo(self.0, self.0,
pseudo_class.to_gecko_pseudoclasstype().unwrap(), pseudo_class.to_gecko_pseudoclasstype().unwrap(),
s.as_ptr(), &mut set_slow_selector); s.as_ptr(),
if set_slow_selector { )
flags_setter(self, HAS_SLOW_SELECTOR);
}
matches
} }
} }
} }