mirror of
https://github.com/servo/servo.git
synced 2025-08-15 10:25:32 +01:00
style: Use cbindgen for content property.
This cleans up and also allows us to keep the distinction between content: none and content: normal, which allows us to fix the computed style we return from getComputedStyle(). Do this last bit from the resolved value instead of StyleAdjuster, because otherwise we need to tweak every initial struct for ::before / ::after. Differential Revision: https://phabricator.services.mozilla.com/D58276
This commit is contained in:
Emilio Cobos Álvarez
parent
07d0eea5fb
commit
219c0f6328
13 changed files with 122 additions and 343 deletions
|
|
@ -36,7 +36,6 @@ use crate::gecko_bindings::bindings::Gecko_SetNullImageValue;
|
|||
use crate::gecko_bindings::structs;
|
||||
use crate::gecko_bindings::structs::nsCSSPropertyID;
|
||||
use crate::gecko_bindings::structs::mozilla::PseudoStyleType;
|
||||
use crate::gecko_bindings::sugar::refptr::RefPtr;
|
||||
use crate::gecko::values::round_border_to_device_pixels;
|
||||
use crate::logical_geometry::WritingMode;
|
||||
use crate::media_queries::Device;
|
||||
|
|
@ -45,7 +44,6 @@ use crate::properties::longhands;
|
|||
use crate::rule_tree::StrongRuleNode;
|
||||
use crate::selector_parser::PseudoElement;
|
||||
use servo_arc::{Arc, RawOffsetArc, UniqueArc};
|
||||
use std::marker::PhantomData;
|
||||
use std::mem::{forget, MaybeUninit};
|
||||
use std::{cmp, ops, ptr};
|
||||
use crate::values::{self, CustomIdent, Either, KeyframesName, None_};
|
||||
|
|
@ -2200,19 +2198,18 @@ fn static_assert() {
|
|||
}
|
||||
|
||||
pub fn set_list_style_type(&mut self, v: longhands::list_style_type::computed_value::T) {
|
||||
use crate::gecko_bindings::bindings::Gecko_SetCounterStyleToName;
|
||||
use crate::gecko_bindings::bindings::Gecko_SetCounterStyleToString;
|
||||
use nsstring::{nsACString, nsCStr};
|
||||
use self::longhands::list_style_type::computed_value::T;
|
||||
match v {
|
||||
T::None => unsafe {
|
||||
Gecko_SetCounterStyleToName(&mut self.gecko.mCounterStyle,
|
||||
atom!("none").into_addrefed());
|
||||
bindings::Gecko_SetCounterStyleToNone(&mut self.gecko.mCounterStyle)
|
||||
}
|
||||
T::CounterStyle(s) => s.to_gecko_value(&mut self.gecko.mCounterStyle),
|
||||
T::String(s) => unsafe {
|
||||
Gecko_SetCounterStyleToString(&mut self.gecko.mCounterStyle,
|
||||
&nsCStr::from(&s) as &nsACString)
|
||||
bindings::Gecko_SetCounterStyleToString(
|
||||
&mut self.gecko.mCounterStyle,
|
||||
&nsCStr::from(&s) as &nsACString,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2580,236 +2577,9 @@ clip-path
|
|||
${impl_simple('column_rule_style', 'mColumnRuleStyle')}
|
||||
</%self:impl_trait>
|
||||
|
||||
<%self:impl_trait style_struct_name="Counters" skip_longhands="content">
|
||||
<%self:impl_trait style_struct_name="Counters">
|
||||
pub fn ineffective_content_property(&self) -> bool {
|
||||
self.gecko.mContents.is_empty()
|
||||
}
|
||||
|
||||
pub fn set_content(&mut self, v: longhands::content::computed_value::T) {
|
||||
use crate::values::CustomIdent;
|
||||
use crate::values::generics::counters::{Content, ContentItem};
|
||||
use crate::values::generics::CounterStyle;
|
||||
use crate::gecko_bindings::structs::nsStyleContentData;
|
||||
use crate::gecko_bindings::structs::nsStyleContentAttr;
|
||||
use crate::gecko_bindings::structs::StyleContentType;
|
||||
use crate::gecko_bindings::bindings::Gecko_ClearAndResizeStyleContents;
|
||||
|
||||
// Converts a string as utf16, and returns an owned, zero-terminated raw buffer.
|
||||
fn as_utf16_and_forget(s: &str) -> *mut u16 {
|
||||
use std::mem;
|
||||
let mut vec = s.encode_utf16().collect::<Vec<_>>();
|
||||
vec.push(0u16);
|
||||
let ptr = vec.as_mut_ptr();
|
||||
mem::forget(vec);
|
||||
ptr
|
||||
}
|
||||
|
||||
fn set_counter_function(
|
||||
data: &mut nsStyleContentData,
|
||||
content_type: StyleContentType,
|
||||
name: CustomIdent,
|
||||
sep: &str,
|
||||
style: CounterStyle,
|
||||
) {
|
||||
debug_assert!(content_type == StyleContentType::Counter ||
|
||||
content_type == StyleContentType::Counters);
|
||||
let counter_func = unsafe {
|
||||
bindings::Gecko_SetCounterFunction(data, content_type).as_mut().unwrap()
|
||||
};
|
||||
counter_func.mIdent.set_move(unsafe {
|
||||
RefPtr::from_addrefed(name.0.into_addrefed())
|
||||
});
|
||||
if content_type == StyleContentType::Counters {
|
||||
counter_func.mSeparator.assign_str(sep);
|
||||
}
|
||||
style.to_gecko_value(&mut counter_func.mCounterStyle);
|
||||
}
|
||||
|
||||
match v {
|
||||
Content::None |
|
||||
Content::Normal => {
|
||||
// Ensure destructors run, otherwise we could leak.
|
||||
if !self.gecko.mContents.is_empty() {
|
||||
unsafe {
|
||||
Gecko_ClearAndResizeStyleContents(&mut *self.gecko, 0);
|
||||
}
|
||||
}
|
||||
},
|
||||
Content::MozAltContent => {
|
||||
unsafe {
|
||||
Gecko_ClearAndResizeStyleContents(&mut *self.gecko, 1);
|
||||
*self.gecko.mContents[0].mContent.mString.as_mut() = ptr::null_mut();
|
||||
}
|
||||
self.gecko.mContents[0].mType = StyleContentType::AltContent;
|
||||
},
|
||||
Content::Items(items) => {
|
||||
unsafe {
|
||||
Gecko_ClearAndResizeStyleContents(&mut *self.gecko,
|
||||
items.len() as u32);
|
||||
}
|
||||
for (i, item) in items.into_vec().into_iter().enumerate() {
|
||||
// NB: Gecko compares the mString value if type is not image
|
||||
// or URI independently of whatever gets there. In the quote
|
||||
// cases, they set it to null, so do the same here.
|
||||
unsafe {
|
||||
*self.gecko.mContents[i].mContent.mString.as_mut() = ptr::null_mut();
|
||||
}
|
||||
match item {
|
||||
ContentItem::String(ref value) => {
|
||||
self.gecko.mContents[i].mType = StyleContentType::String;
|
||||
unsafe {
|
||||
// NB: we share allocators, so doing this is fine.
|
||||
*self.gecko.mContents[i].mContent.mString.as_mut() =
|
||||
as_utf16_and_forget(&value);
|
||||
}
|
||||
}
|
||||
ContentItem::Attr(ref attr) => {
|
||||
self.gecko.mContents[i].mType = StyleContentType::Attr;
|
||||
unsafe {
|
||||
// NB: we share allocators, so doing this is fine.
|
||||
let maybe_ns = attr.namespace.clone();
|
||||
let attr_struct = Box::new(nsStyleContentAttr {
|
||||
mName: structs::RefPtr {
|
||||
mRawPtr: attr.attribute.clone().into_addrefed(),
|
||||
_phantom_0: PhantomData,
|
||||
},
|
||||
mNamespaceURL: structs::RefPtr {
|
||||
mRawPtr: maybe_ns.map_or(ptr::null_mut(), |x| (x.1).0.into_addrefed()),
|
||||
_phantom_0: PhantomData,
|
||||
},
|
||||
});
|
||||
*self.gecko.mContents[i].mContent.mAttr.as_mut() =
|
||||
Box::into_raw(attr_struct);
|
||||
}
|
||||
}
|
||||
ContentItem::OpenQuote
|
||||
=> self.gecko.mContents[i].mType = StyleContentType::OpenQuote,
|
||||
ContentItem::CloseQuote
|
||||
=> self.gecko.mContents[i].mType = StyleContentType::CloseQuote,
|
||||
ContentItem::NoOpenQuote
|
||||
=> self.gecko.mContents[i].mType = StyleContentType::NoOpenQuote,
|
||||
ContentItem::NoCloseQuote
|
||||
=> self.gecko.mContents[i].mType = StyleContentType::NoCloseQuote,
|
||||
ContentItem::Counter(name, style) => {
|
||||
set_counter_function(
|
||||
&mut self.gecko.mContents[i],
|
||||
StyleContentType::Counter,
|
||||
name,
|
||||
"",
|
||||
style,
|
||||
);
|
||||
}
|
||||
ContentItem::Counters(name, sep, style) => {
|
||||
set_counter_function(
|
||||
&mut self.gecko.mContents[i],
|
||||
StyleContentType::Counters,
|
||||
name,
|
||||
&sep,
|
||||
style,
|
||||
);
|
||||
}
|
||||
ContentItem::Url(ref url) => {
|
||||
unsafe {
|
||||
bindings::Gecko_SetContentDataImageValue(
|
||||
&mut self.gecko.mContents[i],
|
||||
url,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn copy_content_from(&mut self, other: &Self) {
|
||||
use crate::gecko_bindings::bindings::Gecko_CopyStyleContentsFrom;
|
||||
unsafe {
|
||||
Gecko_CopyStyleContentsFrom(&mut *self.gecko, &*other.gecko)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn reset_content(&mut self, other: &Self) {
|
||||
self.copy_content_from(other)
|
||||
}
|
||||
|
||||
pub fn clone_content(&self) -> longhands::content::computed_value::T {
|
||||
use {Atom, Namespace};
|
||||
use crate::gecko::conversions::string_from_chars_pointer;
|
||||
use crate::gecko_bindings::structs::StyleContentType;
|
||||
use crate::values::generics::counters::{Content, ContentItem};
|
||||
use crate::values::{CustomIdent, Either};
|
||||
use crate::values::generics::CounterStyle;
|
||||
use crate::values::specified::Attr;
|
||||
|
||||
if self.gecko.mContents.is_empty() {
|
||||
return Content::None;
|
||||
}
|
||||
|
||||
if self.gecko.mContents.len() == 1 &&
|
||||
self.gecko.mContents[0].mType == StyleContentType::AltContent {
|
||||
return Content::MozAltContent;
|
||||
}
|
||||
|
||||
Content::Items(
|
||||
self.gecko.mContents.iter().map(|gecko_content| {
|
||||
match gecko_content.mType {
|
||||
StyleContentType::OpenQuote => ContentItem::OpenQuote,
|
||||
StyleContentType::CloseQuote => ContentItem::CloseQuote,
|
||||
StyleContentType::NoOpenQuote => ContentItem::NoOpenQuote,
|
||||
StyleContentType::NoCloseQuote => ContentItem::NoCloseQuote,
|
||||
StyleContentType::String => {
|
||||
let gecko_chars = unsafe { gecko_content.mContent.mString.as_ref() };
|
||||
let string = unsafe { string_from_chars_pointer(*gecko_chars) };
|
||||
ContentItem::String(string.into_boxed_str())
|
||||
},
|
||||
StyleContentType::Attr => {
|
||||
let (namespace, attribute) = unsafe {
|
||||
let s = &**gecko_content.mContent.mAttr.as_ref();
|
||||
let ns = if s.mNamespaceURL.mRawPtr.is_null() {
|
||||
None
|
||||
} else {
|
||||
// FIXME(bholley): We don't have any way to get the prefix here. :-(
|
||||
let prefix = atom!("");
|
||||
Some((prefix, Namespace(Atom::from_raw(s.mNamespaceURL.mRawPtr))))
|
||||
};
|
||||
(ns, Atom::from_raw(s.mName.mRawPtr))
|
||||
};
|
||||
ContentItem::Attr(Attr { namespace, attribute })
|
||||
},
|
||||
StyleContentType::Counter | StyleContentType::Counters => {
|
||||
let gecko_function =
|
||||
unsafe { &**gecko_content.mContent.mCounters.as_ref() };
|
||||
let ident = CustomIdent(unsafe {
|
||||
Atom::from_raw(gecko_function.mIdent.mRawPtr)
|
||||
});
|
||||
let style =
|
||||
CounterStyle::from_gecko_value(&gecko_function.mCounterStyle);
|
||||
let style = match style {
|
||||
Either::First(counter_style) => counter_style,
|
||||
Either::Second(_) =>
|
||||
unreachable!("counter function shouldn't have single string type"),
|
||||
};
|
||||
if gecko_content.mType == StyleContentType::Counter {
|
||||
ContentItem::Counter(ident, style)
|
||||
} else {
|
||||
let separator = gecko_function.mSeparator.to_string();
|
||||
ContentItem::Counters(ident, separator.into_boxed_str(), style)
|
||||
}
|
||||
},
|
||||
StyleContentType::Image => {
|
||||
unsafe {
|
||||
let gecko_image_request =
|
||||
&**gecko_content.mContent.mImage.as_ref();
|
||||
ContentItem::Url(
|
||||
ComputedImageUrl::from_image_request(gecko_image_request)
|
||||
)
|
||||
}
|
||||
},
|
||||
_ => panic!("Found unexpected value in style struct for content property"),
|
||||
}
|
||||
}).collect::<Vec<_>>().into_boxed_slice()
|
||||
)
|
||||
!self.gecko.mContent.is_items()
|
||||
}
|
||||
</%self:impl_trait>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue