aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2018-09-03 12:56:30 +0200
committerEmilio Cobos Álvarez <emilio@crisal.io>2018-09-03 12:56:30 +0200
commit6d43bf78bc5e2a0c41206dfaa93be6d6c4af527f (patch)
tree2e9dd98f57fbb2b9be2bdec4458ed1c8e8316571
parent31d249fd486fe20ad0a3b20bd891fbb41a374519 (diff)
downloadservo-6d43bf78bc5e2a0c41206dfaa93be6d6c4af527f.tar.gz
servo-6d43bf78bc5e2a0c41206dfaa93be6d6c4af527f.zip
style: Fix servo build.
-rw-r--r--components/style/properties/longhands/box.mako.rs3
-rw-r--r--components/style/selector_parser.rs2
-rw-r--r--components/style/servo/selector_parser.rs4
-rw-r--r--components/style/stylist.rs4
4 files changed, 9 insertions, 4 deletions
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index dcc29227301..7dfc15cd14e 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -378,10 +378,11 @@ ${helpers.predefined_type(
"offset-path",
"OffsetPath",
"computed::OffsetPath::none()",
+ products="gecko",
animation_value_type="none",
gecko_pref="layout.css.motion-path.enabled",
flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
- spec="https://drafts.fxtf.org/motion-1/#offset-path-property"
+ spec="https://drafts.fxtf.org/motion-1/#offset-path-property",
)}
// CSSOM View Module
diff --git a/components/style/selector_parser.rs b/components/style/selector_parser.rs
index 14f09f50d34..5d6ddbb0e3f 100644
--- a/components/style/selector_parser.rs
+++ b/components/style/selector_parser.rs
@@ -6,11 +6,11 @@
#![deny(missing_docs)]
+use Atom;
use cssparser::{Parser as CssParser, ParserInput};
use element_state::ElementState;
use selectors::parser::SelectorList;
use std::fmt::{self, Debug, Write};
-use string_cache::Atom;
use style_traits::{CssWriter, ParseError, ToCss};
use stylesheets::{Namespaces, Origin, UrlExtraData};
use values::serialize_atom_identifier;
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index 6b5efac54f2..c608cd8488d 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -135,6 +135,10 @@ impl PseudoElement {
self.is_before() || self.is_after()
}
+ /// Whether this is an unknown ::-webkit- pseudo-element.
+ #[inline]
+ pub fn is_unknown_webkit_pseudo_element(&self) -> bool { false }
+
/// Whether this pseudo-element is the ::before pseudo.
#[inline]
pub fn is_before(&self) -> bool {
diff --git a/components/style/stylist.rs b/components/style/stylist.rs
index fbf2b18036e..038c41ab103 100644
--- a/components/style/stylist.rs
+++ b/components/style/stylist.rs
@@ -1948,7 +1948,7 @@ pub struct CascadeData {
/// to avoid taking element snapshots when an irrelevant attribute changes.
/// (We don't bother storing the namespace, since namespaced attributes are
/// rare.)
- attribute_dependencies: PrecomputedHashSet<Atom>,
+ attribute_dependencies: PrecomputedHashSet<LocalName>,
/// The element state bits that are relied on by selectors. Like
/// `attribute_dependencies`, this is used to avoid taking element snapshots
@@ -1964,7 +1964,7 @@ pub struct CascadeData {
/// hence in our selector maps). Used to determine when sharing styles is
/// safe: we disallow style sharing for elements whose id matches this
/// filter, and hence might be in one of our selector maps.
- mapped_ids: PrecomputedHashSet<LocalName>,
+ mapped_ids: PrecomputedHashSet<Atom>,
/// Selectors that require explicit cache revalidation (i.e. which depend
/// on state that is not otherwise visible to the cache, like attributes or