Bug 1560777 - Fix Servo build.
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sun, 23 Jun 2019 13:13:21 +0200
changeset 479909 4ed761cebb7f768a44beebca0069fb3320a05018
parent 479908 cce39206381e78106916c8232452f71e9dd86ad9
child 479910 bd23c45f9fe40beca6febd903b23879776b88e33
push id88354
push useremilio@crisal.io
push dateSun, 23 Jun 2019 11:28:20 +0000
treeherderautoland@4ed761cebb7f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1560777
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1560777 - Fix Servo build.
servo/components/style/stylist.rs
servo/components/style/traversal.rs
--- a/servo/components/style/stylist.rs
+++ b/servo/components/style/stylist.rs
@@ -30,20 +30,19 @@ use crate::stylesheets::StyleRule;
 use crate::stylesheets::StylesheetInDocument;
 #[cfg(feature = "gecko")]
 use crate::stylesheets::{CounterStyleRule, FontFaceRule, FontFeatureValuesRule, PageRule};
 use crate::stylesheets::{CssRule, Origin, OriginSet, PerOrigin, PerOriginIter};
 use crate::thread_state::{self, ThreadState};
 use crate::{Atom, LocalName, Namespace, WeakAtom};
 use fallible::FallibleVec;
 use hashglobe::FailedAllocationError;
+use malloc_size_of::MallocSizeOf;
 #[cfg(feature = "gecko")]
-use malloc_size_of::MallocUnconditionalShallowSizeOf;
-#[cfg(feature = "gecko")]
-use malloc_size_of::{MallocShallowSizeOf, MallocSizeOf, MallocSizeOfOps};
+use malloc_size_of::{MallocShallowSizeOf, MallocSizeOfOps, MallocUnconditionalShallowSizeOf};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
 use selectors::bloom::BloomFilter;
 use selectors::matching::VisitedHandlingMode;
 use selectors::matching::{matches_selector, ElementSelectorFlags, MatchingContext, MatchingMode};
 use selectors::parser::{AncestorHashes, Combinator, Component, Selector};
 use selectors::parser::{SelectorIter, Visit};
 use selectors::visitor::SelectorVisitor;
 use selectors::NthIndexCache;
--- a/servo/components/style/traversal.rs
+++ b/servo/components/style/traversal.rs
@@ -688,28 +688,27 @@ where
     element.finish_restyle(context, data, new_styles, important_rules_changed)
 }
 
 #[cfg(feature = "servo")]
 fn notify_paint_worklet<E>(context: &StyleContext<E>, data: &ElementData)
 where
     E: TElement,
 {
-    use crate::values::generics::image::Image;
-    use crate::values::Either;
+    use crate::values::generics::image::{GenericImageLayer, Image};
     use style_traits::ToCss;
 
     // We speculatively evaluate any paint worklets during styling.
     // This allows us to run paint worklets in parallel with style and layout.
     // Note that this is wasted effort if the size of the node has
     // changed, but in may cases it won't have.
     if let Some(ref values) = data.styles.primary {
         for image in &values.get_background().background_image.0 {
             let (name, arguments) = match *image {
-                Either::Second(Image::PaintWorklet(ref worklet)) => {
+                GenericImageLayer::Image(Image::PaintWorklet(ref worklet)) => {
                     (&worklet.name, &worklet.arguments)
                 },
                 _ => continue,
             };
             let painter = match context.shared.registered_speculative_painters.get(name) {
                 Some(painter) => painter,
                 None => continue,
             };