Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Implement a non-recursive version of CSS quotes (#34770)

Browse source 
* Squash and don't explicitly use noto-cjk in tests

Signed-off-by: Xiaocheng Hu <xiaochengh.work@gmail.com>

* Mark quotes-034.html.ini failure

Signed-off-by: Xiaocheng Hu <xiaochengh.work@gmail.com>

* Address review comments

Signed-off-by: Xiaocheng Hu <xiaochengh.work@gmail.com>

---------

Signed-off-by: Xiaocheng Hu <xiaochengh.work@gmail.com>
This commit is contained in:
Xiaocheng Hu 2025-02-28 00:00:21 +08:00 • committed by GitHub
parent 31de9c1c21
commit 11f54b9f23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 536 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/script/dom/element.rs
View file

@ -716,6 +716,7 @@ pub(crate) trait LayoutElementHelpers<'dom> {
fn style_attribute(self) -> *const Option<Arc<Locked<PropertyDeclarationBlock>>>;
fn local_name(self) -> &'dom LocalName;
fn namespace(self) -> &'dom Namespace;
fn get_lang_attr_val_for_layout(self) -> Option<&'dom str>;
fn get_lang_for_layout(self) -> String;
fn get_state_for_layout(self) -> ElementState;
fn insert_selector_flags(self, flags: ElementSelectorFlags);
@ -783,6 +784,15 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
let document = self.upcast::<Node>().owner_doc_for_layout();
let shared_lock = document.style_shared_lock();
// TODO(xiaochengh): This is probably not enough. When the root element doesn't have a `lang`,
// we should check the browser settings and system locale.
if let Some(lang) = self.get_lang_attr_val_for_layout() {
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::XLang(specified::XLang(Atom::from(lang.to_owned()))),
));
}
let bgcolor = if let Some(this) = self.downcast::<HTMLBodyElement>() {
this.get_background_color()
} else if let Some(this) = self.downcast::<HTMLTableElement>() {
@ -1181,18 +1191,23 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
&(self.unsafe_get()).namespace
}
fn get_lang_attr_val_for_layout(self) -> Option<&'dom str> {
if let Some(attr) = self.get_attr_val_for_layout(&ns!(xml), &local_name!("lang")) {
return Some(attr);
}
if let Some(attr) = self.get_attr_val_for_layout(&ns!(), &local_name!("lang")) {
return Some(attr);
}
None
}
fn get_lang_for_layout(self) -> String {
let mut current_node = Some(self.upcast::<Node>());
while let Some(node) = current_node {
current_node = node.composed_parent_node_ref();
match node.downcast::<Element>() {
Some(elem) => {
if let Some(attr) =
elem.get_attr_val_for_layout(&ns!(xml), &local_name!("lang"))
{
return attr.to_owned();
}
if let Some(attr) = elem.get_attr_val_for_layout(&ns!(), &local_name!("lang")) {
if let Some(attr) = elem.get_lang_attr_val_for_layout() {
return attr.to_owned();
}
},
@ -3546,7 +3561,9 @@ impl VirtualMethods for Element {
fn attribute_affects_presentational_hints(&self, attr: &Attr) -> bool {
// FIXME: This should be more fine-grained, not all elements care about these.
if attr.local_name() == &local_name!("width") || attr.local_name() == &local_name!("height")
if attr.local_name() == &local_name!("width") ||
attr.local_name() == &local_name!("height") ||
attr.local_name() == &local_name!("lang")
{
return true;
}