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

Introduce more layout helpers to make selection_for_layout be safe

Browse source
This commit is contained in:
Anthony Ramine 2020-04-01 11:35:07 +02:00
parent 28e5abe606
commit d9e4f7a0ba
3 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -706,8 +706,7 @@ impl HTMLInputElement {
pub trait LayoutHTMLInputElementHelpers<'dom> { pub trait LayoutHTMLInputElementHelpers<'dom> {
fn value_for_layout(self) -> Cow<'dom, str>; fn value_for_layout(self) -> Cow<'dom, str>;
fn size_for_layout(self) -> u32; fn size_for_layout(self) -> u32;
#[allow(unsafe_code)] fn selection_for_layout(self) -> Option<Range<usize>>;
unsafe fn selection_for_layout(self) -> Option<Range<usize>>;
fn checked_state_for_layout(self) -> bool; fn checked_state_for_layout(self) -> bool;
fn indeterminate_state_for_layout(self) -> bool; fn indeterminate_state_for_layout(self) -> bool;
} }
@ -730,6 +729,15 @@ impl<'dom> LayoutDom<'dom, HTMLInputElement> {
fn input_type(self) -> InputType { fn input_type(self) -> InputType {
unsafe { self.unsafe_get().input_type.get() } unsafe { self.unsafe_get().input_type.get() }
} }
fn textinput_sorted_selection_offsets_range(self) -> Range<UTF8Bytes> {
unsafe {
self.unsafe_get()
.textinput
.borrow_for_layout()
.sorted_selection_offsets_range()
}
}
} }
impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElement> { impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElement> {
@ -778,18 +786,17 @@ impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElem
unsafe { self.unsafe_get().size.get() } unsafe { self.unsafe_get().size.get() }
} }
#[allow(unsafe_code)] fn selection_for_layout(self) -> Option<Range<usize>> {
unsafe fn selection_for_layout(self) -> Option<Range<usize>> {
if !self.upcast::<Element>().focus_state() { if !self.upcast::<Element>().focus_state() {
return None; return None;
} }
let textinput = (*self.unsafe_get()).textinput.borrow_for_layout(); let sorted_selection_offsets_range = self.textinput_sorted_selection_offsets_range();
match self.input_type() { match self.input_type() {
InputType::Password => { InputType::Password => {
let text = self.get_raw_textinput_value(); let text = self.get_raw_textinput_value();
let sel = UTF8Bytes::unwrap_range(textinput.sorted_selection_offsets_range()); let sel = UTF8Bytes::unwrap_range(sorted_selection_offsets_range);
// Translate indices from the raw value to indices in the replacement value. // Translate indices from the raw value to indices in the replacement value.
let char_start = text[..sel.start].chars().count(); let char_start = text[..sel.start].chars().count();
@ -798,9 +805,9 @@ impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElem
let bytes_per_char = PASSWORD_REPLACEMENT_CHAR.len_utf8(); let bytes_per_char = PASSWORD_REPLACEMENT_CHAR.len_utf8();
Some(char_start * bytes_per_char..char_end * bytes_per_char) Some(char_start * bytes_per_char..char_end * bytes_per_char)
}, },
input_type if input_type.is_textual() => Some(UTF8Bytes::unwrap_range( input_type if input_type.is_textual() => {
textinput.sorted_selection_offsets_range(), Some(UTF8Bytes::unwrap_range(sorted_selection_offsets_range))
)), },
_ => None, _ => None,
} }
} }

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

@ -57,8 +57,7 @@ pub struct HTMLTextAreaElement {
pub trait LayoutHTMLTextAreaElementHelpers { pub trait LayoutHTMLTextAreaElementHelpers {
fn value_for_layout(self) -> String; fn value_for_layout(self) -> String;
#[allow(unsafe_code)] fn selection_for_layout(self) -> Option<Range<usize>>;
unsafe fn selection_for_layout(self) -> Option<Range<usize>>;
fn get_cols(self) -> u32; fn get_cols(self) -> u32;
fn get_rows(self) -> u32; fn get_rows(self) -> u32;
} }
@ -74,6 +73,15 @@ impl<'dom> LayoutDom<'dom, HTMLTextAreaElement> {
} }
} }
fn textinput_sorted_selection_offsets_range(self) -> Range<UTF8Bytes> {
unsafe {
self.unsafe_get()
.textinput
.borrow_for_layout()
.sorted_selection_offsets_range()
}
}
fn placeholder(self) -> &'dom str { fn placeholder(self) -> &'dom str {
unsafe { self.unsafe_get().placeholder.borrow_for_layout() } unsafe { self.unsafe_get().placeholder.borrow_for_layout() }
} }
@ -94,14 +102,12 @@ impl LayoutHTMLTextAreaElementHelpers for LayoutDom<'_, HTMLTextAreaElement> {
} }
} }
#[allow(unsafe_code)] fn selection_for_layout(self) -> Option<Range<usize>> {
unsafe fn selection_for_layout(self) -> Option<Range<usize>> {
if !self.upcast::<Element>().focus_state() { if !self.upcast::<Element>().focus_state() {
return None; return None;
} }
let textinput = (*self.unsafe_get()).textinput.borrow_for_layout();
Some(UTF8Bytes::unwrap_range( Some(UTF8Bytes::unwrap_range(
textinput.sorted_selection_offsets_range(), self.textinput_sorted_selection_offsets_range(),
)) ))
} }

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

@ -1478,14 +1478,13 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> {
panic!("not text!") panic!("not text!")
} }
#[allow(unsafe_code)]
fn selection(self) -> Option<Range<usize>> { fn selection(self) -> Option<Range<usize>> {
if let Some(area) = self.downcast::<HTMLTextAreaElement>() { if let Some(area) = self.downcast::<HTMLTextAreaElement>() {
return unsafe { area.selection_for_layout() }; return area.selection_for_layout();
} }
if let Some(input) = self.downcast::<HTMLInputElement>() { if let Some(input) = self.downcast::<HTMLInputElement>() {
return unsafe { input.selection_for_layout() }; return input.selection_for_layout();
} }
None None