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

Make LayoutHTMLTextAreaElementHelpers::value_for_layout safe

Browse source
This commit is contained in:
Anthony Ramine 2020-03-31 14:35:37 +02:00
parent e1e913d33c
commit 00c5ec202c
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/script/dom/htmltextareaelement.rs
View file

@ -56,8 +56,7 @@ pub struct HTMLTextAreaElement {
}
pub trait LayoutHTMLTextAreaElementHelpers {
#[allow(unsafe_code)]
unsafe fn value_for_layout(self) -> String;
fn value_for_layout(self) -> String;
#[allow(unsafe_code)]
unsafe fn selection_for_layout(self) -> Option<Range<usize>>;
#[allow(unsafe_code)]
@ -67,19 +66,19 @@ pub trait LayoutHTMLTextAreaElementHelpers {
}
impl LayoutHTMLTextAreaElementHelpers for LayoutDom<'_, HTMLTextAreaElement> {
#[allow(unrooted_must_root)]
#[allow(unsafe_code)]
unsafe fn value_for_layout(self) -> String {
let text = (*self.unsafe_get())
.textinput
.borrow_for_layout()
.get_content();
if text.is_empty() {
(*self.unsafe_get())
.placeholder
fn value_for_layout(self) -> String {
let text = unsafe {
self.unsafe_get()
.textinput
.borrow_for_layout()
.replace("\r\n", "\n")
.replace("\r", "\n")
.get_content()
};
if text.is_empty() {
let placeholder = unsafe { self.unsafe_get().placeholder.borrow_for_layout() };
// FIXME(nox): Would be cool to not allocate a new string if the
// placeholder is single line, but that's an unimportant detail.
placeholder.replace("\r\n", "\n").replace("\r", "\n").into()
} else {
text.into()
}

2
components/script/dom/node.rs
View file

@ -1467,7 +1467,7 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> {
}
if let Some(area) = self.downcast::<HTMLTextAreaElement>() {
return unsafe { area.value_for_layout() };
return area.value_for_layout();
}
panic!("not text!")