diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs index 0a14c3447dc8..47c904cbe0e7 100644 --- a/components/style/gecko/media_queries.rs +++ b/components/style/gecko/media_queries.rs @@ -137,8 +137,15 @@ impl ToCss for Expression { } } +impl PartialEq for Expression { + fn eq(&self, other: &Expression) -> bool { + self.feature.mName == other.feature.mName && + self.value == other.value && self.range == other.range + } +} + /// A resolution. -#[derive(Debug, Clone)] +#[derive(PartialEq, Debug, Clone)] pub enum Resolution { /// Dots per inch. Dpi(CSSFloat), @@ -200,7 +207,7 @@ unsafe fn string_from_ns_string_buffer(buffer: *const nsStringBuffer) -> String } /// A value found or expected in a media expression. -#[derive(Debug, Clone)] +#[derive(PartialEq, Debug, Clone)] pub enum MediaExpressionValue { /// A length. Length(specified::Length), diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs index cb707ef3694c..2a92156fee40 100644 --- a/components/style/gecko_bindings/bindings.rs +++ b/components/style/gecko_bindings/bindings.rs @@ -1627,6 +1627,34 @@ extern "C" { pub fn Servo_DeclarationBlock_SetTextDecorationColorOverride(declarations: RawServoDeclarationBlockBorrowed); } +extern "C" { + pub fn Servo_MediaList_GetText(list: RawServoMediaListBorrowed, + result: *mut nsAString_internal); +} +extern "C" { + pub fn Servo_MediaList_SetText(list: RawServoMediaListBorrowed, + text: *const nsACString_internal); +} +extern "C" { + pub fn Servo_MediaList_GetLength(list: RawServoMediaListBorrowed) -> u32; +} +extern "C" { + pub fn Servo_MediaList_GetMediumAt(list: RawServoMediaListBorrowed, + index: u32, + result: *mut nsAString_internal) + -> bool; +} +extern "C" { + pub fn Servo_MediaList_AppendMedium(list: RawServoMediaListBorrowed, + new_medium: + *const nsACString_internal); +} +extern "C" { + pub fn Servo_MediaList_DeleteMedium(list: RawServoMediaListBorrowed, + old_medium: + *const nsACString_internal) + -> bool; +} extern "C" { pub fn Servo_CSSSupports2(name: *const nsACString_internal, value: *const nsACString_internal) -> bool; diff --git a/components/style/media_queries.rs b/components/style/media_queries.rs index 19a7fd41b39b..fea6811ffc2e 100644 --- a/components/style/media_queries.rs +++ b/components/style/media_queries.rs @@ -66,7 +66,7 @@ impl ToCss for Qualifier { /// A [media query][mq]. /// /// [mq]: https://drafts.csswg.org/mediaqueries/ -#[derive(Clone, Debug)] +#[derive(PartialEq, Clone, Debug)] #[cfg_attr(feature = "servo", derive(HeapSizeOf))] pub struct MediaQuery { /// The qualifier for this query. @@ -299,4 +299,37 @@ impl MediaList { pub fn is_empty(&self) -> bool { self.media_queries.is_empty() } + + /// Append a new media query item to the media list. + /// https://drafts.csswg.org/cssom/#dom-medialist-appendmedium + /// + /// Returns true if added, false if fail to parse the medium string. + pub fn append_medium(&mut self, new_medium: &str) -> bool { + let mut parser = Parser::new(new_medium); + let new_query = match MediaQuery::parse(&mut parser) { + Ok(query) => query, + Err(_) => { return false; } + }; + // This algorithm doesn't actually matches the current spec, + // but it matches the behavior of Gecko and Edge. + // See https://github.com/w3c/csswg-drafts/issues/697 + self.media_queries.retain(|query| query != &new_query); + self.media_queries.push(new_query); + true + } + + /// Delete a media query from the media list. + /// https://drafts.csswg.org/cssom/#dom-medialist-deletemedium + /// + /// Returns true if found and deleted, false otherwise. + pub fn delete_medium(&mut self, old_medium: &str) -> bool { + let mut parser = Parser::new(old_medium); + let old_query = match MediaQuery::parse(&mut parser) { + Ok(query) => query, + Err(_) => { return false; } + }; + let old_len = self.media_queries.len(); + self.media_queries.retain(|query| query != &old_query); + old_len != self.media_queries.len() + } } diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 40cd97d3679d..ac51002a1aae 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -32,6 +32,7 @@ use style::gecko::wrapper::GeckoElement; use style::gecko_bindings::bindings; use style::gecko_bindings::bindings::{RawGeckoKeyframeListBorrowed, RawGeckoKeyframeListBorrowedMut}; use style::gecko_bindings::bindings::{RawServoDeclarationBlockBorrowed, RawServoDeclarationBlockStrong}; +use style::gecko_bindings::bindings::{RawServoMediaListBorrowed, RawServoMediaListStrong}; use style::gecko_bindings::bindings::{RawServoMediaRuleBorrowed, RawServoMediaRuleStrong}; use style::gecko_bindings::bindings::{RawServoStyleRuleBorrowed, RawServoStyleRuleStrong}; use style::gecko_bindings::bindings::{RawServoStyleSetBorrowed, RawServoStyleSetOwned}; @@ -45,7 +46,6 @@ use style::gecko_bindings::bindings::RawGeckoElementBorrowed; use style::gecko_bindings::bindings::RawServoAnimationValueBorrowed; use style::gecko_bindings::bindings::RawServoAnimationValueStrong; use style::gecko_bindings::bindings::RawServoImportRuleBorrowed; -use style::gecko_bindings::bindings::RawServoMediaListStrong; use style::gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull; use style::gecko_bindings::bindings::nsTArrayBorrowed_uintptr_t; use style::gecko_bindings::structs; @@ -64,6 +64,7 @@ use style::gecko_bindings::sugar::ownership::{HasSimpleFFI, Strong}; use style::gecko_bindings::sugar::refptr::{GeckoArcPrincipal, GeckoArcURI}; use style::gecko_properties::{self, style_structs}; use style::keyframes::KeyframesStepValue; +use style::media_queries::{MediaList, parse_media_query_list}; use style::parallel; use style::parser::{ParserContext, ParserContextExtraData}; use style::properties::{ComputedValues, Importance, ParsedDeclaration}; @@ -919,6 +920,54 @@ pub extern "C" fn Servo_DeclarationBlock_RemovePropertyById(declarations: RawSer remove_property(declarations, get_property_id_from_nscsspropertyid!(property, ())) } +#[no_mangle] +pub extern "C" fn Servo_MediaList_GetText(list: RawServoMediaListBorrowed, result: *mut nsAString) { + let list = RwLock::::as_arc(&list); + list.read().to_css(unsafe { result.as_mut().unwrap() }).unwrap(); +} + +#[no_mangle] +pub extern "C" fn Servo_MediaList_SetText(list: RawServoMediaListBorrowed, text: *const nsACString) { + let list = RwLock::::as_arc(&list); + let text = unsafe { text.as_ref().unwrap().as_str_unchecked() }; + let mut parser = Parser::new(&text); + *list.write() = parse_media_query_list(&mut parser); +} + +#[no_mangle] +pub extern "C" fn Servo_MediaList_GetLength(list: RawServoMediaListBorrowed) -> u32 { + let list = RwLock::::as_arc(&list); + list.read().media_queries.len() as u32 +} + +#[no_mangle] +pub extern "C" fn Servo_MediaList_GetMediumAt(list: RawServoMediaListBorrowed, index: u32, + result: *mut nsAString) -> bool { + let list = RwLock::::as_arc(&list); + if let Some(media_query) = list.read().media_queries.get(index as usize) { + media_query.to_css(unsafe { result.as_mut().unwrap() }).unwrap(); + true + } else { + false + } +} + +#[no_mangle] +pub extern "C" fn Servo_MediaList_AppendMedium(list: RawServoMediaListBorrowed, + new_medium: *const nsACString) { + let list = RwLock::::as_arc(&list); + let new_medium = unsafe { new_medium.as_ref().unwrap().as_str_unchecked() }; + list.write().append_medium(new_medium); +} + +#[no_mangle] +pub extern "C" fn Servo_MediaList_DeleteMedium(list: RawServoMediaListBorrowed, + old_medium: *const nsACString) -> bool { + let list = RwLock::::as_arc(&list); + let old_medium = unsafe { old_medium.as_ref().unwrap().as_str_unchecked() }; + list.write().delete_medium(old_medium) +} + macro_rules! get_longhand_from_id { ($id:expr, $retval:expr) => { match PropertyId::from_nscsspropertyid($id) {