Miscellaneous build / tidy fixes.

components/layout/construct.rs

@@ -71,8 +71,8 @@ use style::logical_geometry::Direction;
 use style::properties::ComputedValues;
 use style::selector_parser::{PseudoElement, RestyleDamage};
 use style::servo::restyle_damage::ServoRestyleDamage;
+use style::values::computed::Image;
 use style::values::generics::counters::ContentItem;
-use style::values::generics::url::UrlOrNone as ImageUrlOrNone;
 
 /// The results of flow construction for a DOM node.
 #[derive(Clone)]
@@ -1506,9 +1506,9 @@ where
     ) -> ConstructionResult {
         let flotation = FloatKind::from_property(flotation);
         let marker_fragments = match node.style(self.style_context()).get_list().list_style_image {
-            ImageUrlOrNone::Url(ref url_value) => {
+            Image::Url(ref url_value) => {
                 let image_info = Box::new(ImageFragmentInfo::new(
-                    url_value.url().map(|u| u.clone()),
+                    url_value.url().cloned(),
                     None,
                     node,
                     &self.layout_context,
@@ -1519,7 +1519,13 @@ where
                     self.layout_context,
                 )]
             },
-            ImageUrlOrNone::None => match ListStyleTypeContent::from_list_style_type(
+            // XXX: Non-None image types unimplemented.
+            Image::ImageSet(..) |
+            Image::Rect(..) |
+            Image::Gradient(..) |
+            Image::PaintWorklet(..) |
+            Image::CrossFade(..) |
+            Image::None => match ListStyleTypeContent::from_list_style_type(
                 node.style(self.style_context()).get_list().list_style_type,
             ) {
                 ListStyleTypeContent::None => Vec::new(),

components/layout/display_list/builder.rs

@@ -792,6 +792,9 @@ impl Fragment {
                         );
                     }
                 },
+                Image::CrossFade(..) | Image::ImageSet(..) => {
+                    unreachable!("Shouldn't be parsed by Servo for now")
+                },
                 Image::Rect(ref rect) => {
                     // This is a (boxed) empty enum on non-Gecko
                     match **rect {}

components/layout/query.rs

@@ -47,6 +47,7 @@ use style::properties::{
 };
 use style::selector_parser::PseudoElement;
 use style::shared_lock::SharedRwLock;
+use style::stylesheets::{CssRuleType, Origin};
 use style_traits::{CSSPixel, ParsingMode, ToCss};
 use webrender_api::ExternalScrollId;
 
@@ -762,10 +763,12 @@ fn create_font_declaration(
         &mut declarations,
         property.clone(),
         value,
+        Origin::Author,
         url_data,
         None,
         ParsingMode::DEFAULT,
         quirks_mode,
+        CssRuleType::Style,
     );
     let declarations = match result {
         Ok(()) => {