Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: fixed document title being set to Some("") instead of None (#33354)

Browse source 
* Fixed document title being set to "" instead of None

Signed-off-by: Benjamin Vincent Schulenburg <bennyschulenburg@gmx.de>

* Update components/script/dom/document.rs

Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Signed-off-by: Ben <bennyschulenburg@gmx.de>

---------

Signed-off-by: Benjamin Vincent Schulenburg <bennyschulenburg@gmx.de>
Signed-off-by: Ben <bennyschulenburg@gmx.de>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Ben 2024-09-10 07:06:50 +00:00 • committed by GitHub
parent 7ec22306e8
commit 8286dd33a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

56
components/script/dom/document.rs
View file

@ -1235,11 +1235,39 @@ impl Document {
} }
} }
/// Determine the title of the [`Document`] according to the specification at:
/// <https://html.spec.whatwg.org/multipage/#document.title>. The difference
/// here is that when the title isn't specified `None` is returned.
fn title(&self) -> Option<DOMString> {
let title = self.GetDocumentElement().and_then(|root| {
if root.namespace() == &ns!(svg) && root.local_name() == &local_name!("svg") {
// Step 1.
root.upcast::<Node>()
.child_elements()
.find(|node| {
node.namespace() == &ns!(svg) && node.local_name() == &local_name!("title")
})
.map(DomRoot::upcast::<Node>)
} else {
// Step 2.
root.upcast::<Node>()
.traverse_preorder(ShadowIncluding::No)
.find(|node| node.is::<HTMLTitleElement>())
}
});
title.map(|title| {
// Steps 3-4.
let value = title.child_text_content();
DOMString::from(str_join(split_html_space_chars(&value), " "))
})
}
/// Sends this document's title to the constellation. /// Sends this document's title to the constellation.
pub fn send_title_to_embedder(&self) { pub fn send_title_to_embedder(&self) {
let window = self.window(); let window = self.window();
if window.is_top_level() { if window.is_top_level() {
let title = Some(String::from(self.Title())); let title = self.title().map(String::from);
self.send_to_embedder(EmbedderMsg::ChangePageTitle(title)); self.send_to_embedder(EmbedderMsg::ChangePageTitle(title));
} }
} }
@ -4635,31 +4663,7 @@ impl DocumentMethods for Document {
// https://html.spec.whatwg.org/multipage/#document.title // https://html.spec.whatwg.org/multipage/#document.title
fn Title(&self) -> DOMString { fn Title(&self) -> DOMString {
let title = self.GetDocumentElement().and_then(|root| { self.title().unwrap_or_else(|| DOMString::from(""))
if root.namespace() == &ns!(svg) && root.local_name() == &local_name!("svg") {
// Step 1.
root.upcast::<Node>()
.child_elements()
.find(|node| {
node.namespace() == &ns!(svg) && node.local_name() == &local_name!("title")
})
.map(DomRoot::upcast::<Node>)
} else {
// Step 2.
root.upcast::<Node>()
.traverse_preorder(ShadowIncluding::No)
.find(|node| node.is::<HTMLTitleElement>())
}
});
match title {
None => DOMString::new(),
Some(ref title) => {
// Steps 3-4.
let value = title.child_text_content();
DOMString::from(str_join(split_html_space_chars(&value), " "))
},
}
} }
// https://html.spec.whatwg.org/multipage/#document.title // https://html.spec.whatwg.org/multipage/#document.title