From 2a5007926d32a56c2836fce5184d58df594b19d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 15 May 2018 11:37:12 +0200 Subject: [PATCH] Fix Servo build. --- components/layout/construct.rs | 2 +- components/layout/display_list/builder.rs | 6 +++--- components/layout/display_list/conversions.rs | 2 ++ components/layout/generated_content.rs | 5 ++++- components/layout/wrapper.rs | 13 +++++++------ components/style/properties/properties.mako.rs | 6 +++--- components/style/values/animated/effects.rs | 3 ++- components/style/values/computed/effects.rs | 3 ++- components/style/values/specified/effects.rs | 3 ++- 9 files changed, 26 insertions(+), 17 deletions(-) diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 561cc8429de..0adde8d7255 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -54,7 +54,7 @@ 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::counters::ContentItem; +use style::values::generics::counters::ContentItem; use style::values::generics::url::UrlOrNone as ImageUrlOrNone; use table::TableFlow; use table_caption::TableCaptionFlow; diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index 35d3e176205..56f92466750 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -66,7 +66,7 @@ use style::values::computed::Gradient; use style::values::computed::effects::SimpleShadow; use style::values::generics::background::BackgroundSize; use style::values::generics::image::{GradientKind, Image, PaintWorklet}; -use style::values::generics::pointing::Cursor; +use style::values::generics::ui::Cursor; use style_traits::CSSPixel; use style_traits::ToCss; use style_traits::cursor::CursorKind; @@ -3012,8 +3012,8 @@ impl ComputedValuesCursorUtility for ComputedValues { #[inline] fn get_cursor(&self, default_cursor: CursorKind) -> Option { match ( - self.get_pointing().pointer_events, - &self.get_pointing().cursor, + self.get_inheritedui().pointer_events, + &self.get_inheritedui().cursor, ) { (PointerEvents::None, _) => None, (PointerEvents::Auto, &Cursor { keyword: CursorKind::Auto, .. }) => Some(default_cursor), diff --git a/components/layout/display_list/conversions.rs b/components/layout/display_list/conversions.rs index e1dff8f1c62..b8c5a8e98b6 100644 --- a/components/layout/display_list/conversions.rs +++ b/components/layout/display_list/conversions.rs @@ -51,6 +51,8 @@ impl ToLayout for Filter { GenericFilter::Sepia(amount) => wr::FilterOp::Sepia(amount.0), // Statically check that DropShadow is impossible. GenericFilter::DropShadow(ref shadow) => match *shadow {}, + // Statically check that Url is impossible. + GenericFilter::Url(ref url) => match *url {}, } } } diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs index da390cc9cec..a006fdfa4b4 100644 --- a/components/layout/generated_content.rs +++ b/components/layout/generated_content.rs @@ -20,7 +20,7 @@ use style::computed_values::list_style_type::T as ListStyleType; use style::properties::ComputedValues; use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::ServoRestyleDamage; -use style::values::computed::counters::ContentItem; +use style::values::generics::counters::ContentItem; use text::TextRunScanner; use traversal::InorderFlowTraversal; @@ -240,6 +240,9 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> { self.traversal.quote -= 1 } } + GeneratedContentInfo::ContentItem(ContentItem::Url(..)) => { + unreachable!("Servo doesn't parse content: url(..) yet") + } } }; diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index c9b9b88bb5d..63507127b07 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -36,7 +36,8 @@ use script_layout_interface::wrapper_traits::{ThreadSafeLayoutElement, ThreadSaf use script_layout_interface::wrapper_traits::GetLayoutData; use style::dom::{NodeInfo, TNode}; use style::selector_parser::RestyleDamage; -use style::values::computed::counters::{Content, ContentItem}; +use style::values::computed::counters::ContentItem; +use style::values::generics::counters::Content; pub trait LayoutNodeLayoutData { /// Similar to borrow_data*, but returns the full PersistentLayoutData rather @@ -113,12 +114,12 @@ impl ThreadSafeLayoutNodeHelpers for T { if self.get_pseudo_element_type().is_replaced_content() { let style = self.as_element().unwrap().resolved_style(); - return match style.as_ref().get_counters().content { - Content::Items(ref value) if !value.is_empty() => { - TextContent::GeneratedContent((*value).to_vec()) + return TextContent::GeneratedContent( + match style.as_ref().get_counters().content { + Content::Items(ref value) => value.to_vec(), + _ => vec![], } - _ => TextContent::GeneratedContent(vec![]), - }; + ); } TextContent::Text(self.node_text_content().into_boxed_str()) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index c6de9d2f268..9e5d4c3b7f1 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2643,10 +2643,10 @@ impl ComputedValuesInner { /// ineffective, and would yield an empty `::before` or `::after` /// pseudo-element. pub fn ineffective_content_property(&self) -> bool { - use properties::longhands::content::computed_value::T; + use values::generics::counters::Content; match self.get_counters().content { - T::Normal | T::None => true, - T::Items(ref items) => items.is_empty(), + Content::Normal | Content::None => true, + Content::Items(ref items) => items.is_empty(), } } diff --git a/components/style/values/animated/effects.rs b/components/style/values/animated/effects.rs index 1bc04c6167a..e0f4cf7b7c0 100644 --- a/components/style/values/animated/effects.rs +++ b/components/style/values/animated/effects.rs @@ -14,6 +14,7 @@ use values::animated::{Animate, Procedure, ToAnimatedValue, ToAnimatedZero}; use values::animated::color::RGBA; use values::computed::{Angle, Number}; use values::computed::length::Length; +#[cfg(feature = "gecko")] use values::computed::url::ComputedUrl; use values::distance::{ComputeSquaredDistance, SquaredDistance}; use values::generics::effects::BoxShadow as GenericBoxShadow; @@ -47,7 +48,7 @@ pub type Filter = GenericFilter; +pub type Filter = GenericFilter; /// An animated value for the `drop-shadow()` filter. pub type SimpleShadow = GenericSimpleShadow, Length, Length>; diff --git a/components/style/values/computed/effects.rs b/components/style/values/computed/effects.rs index 3db1caf4f90..3d804d42605 100644 --- a/components/style/values/computed/effects.rs +++ b/components/style/values/computed/effects.rs @@ -9,6 +9,7 @@ use values::Impossible; use values::computed::{Angle, NonNegativeNumber}; use values::computed::color::RGBAColor; use values::computed::length::{Length, NonNegativeLength}; +#[cfg(feature = "gecko")] use values::computed::url::ComputedUrl; use values::generics::effects::BoxShadow as GenericBoxShadow; use values::generics::effects::Filter as GenericFilter; @@ -23,7 +24,7 @@ pub type Filter = GenericFilter; +pub type Filter = GenericFilter; /// A computed value for the `drop-shadow()` filter. pub type SimpleShadow = GenericSimpleShadow, Length, NonNegativeLength>; diff --git a/components/style/values/specified/effects.rs b/components/style/values/specified/effects.rs index 5d76d4ecf88..f10b53fa788 100644 --- a/components/style/values/specified/effects.rs +++ b/components/style/values/specified/effects.rs @@ -19,6 +19,7 @@ use values::generics::effects::SimpleShadow as GenericSimpleShadow; use values::specified::{Angle, NumberOrPercentage}; use values::specified::color::RGBAColor; use values::specified::length::{Length, NonNegativeLength}; +#[cfg(feature = "gecko")] use values::specified::url::SpecifiedUrl; /// A specified value for a single shadow of the `box-shadow` property. @@ -31,7 +32,7 @@ pub type Filter = GenericFilter; +pub type Filter = GenericFilter; /// A value for the `` parts in `Filter`. #[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss)]