Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-17 21:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Introduce a bunch of LayoutDom<HTMLInputElement> private helpers

Browse source 
Those help contain the unsafety in most of the actual helpers used by layout.
This commit is contained in:
Anthony Ramine 2020-03-31 23:06:20 +02:00
parent 1cd3d6bd4c
commit f8af8176de
1 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -705,26 +705,34 @@ 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>;
#[allow(unsafe_code)] fn size_for_layout(self) -> u32;
unsafe fn size_for_layout(self) -> u32;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn selection_for_layout(self) -> Option<Range<usize>>; unsafe fn selection_for_layout(self) -> Option<Range<usize>>;
#[allow(unsafe_code)] fn checked_state_for_layout(self) -> bool;
unsafe fn checked_state_for_layout(self) -> bool; fn indeterminate_state_for_layout(self) -> bool;
#[allow(unsafe_code)]
unsafe fn indeterminate_state_for_layout(self) -> bool;
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_raw_textinput_value(input: LayoutDom<HTMLInputElement>) -> DOMString { impl<'dom> LayoutDom<'dom, HTMLInputElement> {
(*input.unsafe_get()) fn get_raw_textinput_value(self) -> DOMString {
.textinput unsafe {
.borrow_for_layout() self.unsafe_get()
.get_content() .textinput
.borrow_for_layout()
.get_content()
}
}
fn placeholder(self) -> &'dom str {
unsafe { self.unsafe_get().placeholder.borrow_for_layout() }
}
fn input_type(self) -> InputType {
unsafe { self.unsafe_get().input_type.get() }
}
} }
impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElement> { impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElement> {
#[allow(unsafe_code)]
fn value_for_layout(self) -> Cow<'dom, str> { fn value_for_layout(self) -> Cow<'dom, str> {
fn get_raw_attr_value<'dom>( fn get_raw_attr_value<'dom>(
input: LayoutDom<'dom, HTMLInputElement>, input: LayoutDom<'dom, HTMLInputElement>,
@ -737,42 +745,39 @@ impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElem
.into() .into()
} }
let placeholder = unsafe { &**self.unsafe_get().placeholder.borrow_for_layout() }; match self.input_type() {
match unsafe { self.unsafe_get().input_type() } {
InputType::Checkbox | InputType::Radio => "".into(), InputType::Checkbox | InputType::Radio => "".into(),
InputType::File | InputType::Image => "".into(), InputType::File | InputType::Image => "".into(),
InputType::Button => get_raw_attr_value(self, ""), InputType::Button => get_raw_attr_value(self, ""),
InputType::Submit => get_raw_attr_value(self, DEFAULT_SUBMIT_VALUE), InputType::Submit => get_raw_attr_value(self, DEFAULT_SUBMIT_VALUE),
InputType::Reset => get_raw_attr_value(self, DEFAULT_RESET_VALUE), InputType::Reset => get_raw_attr_value(self, DEFAULT_RESET_VALUE),
InputType::Password => { InputType::Password => {
let text = unsafe { get_raw_textinput_value(self) }; let text = self.get_raw_textinput_value();
if !text.is_empty() { if !text.is_empty() {
text.chars() text.chars()
.map(|_| PASSWORD_REPLACEMENT_CHAR) .map(|_| PASSWORD_REPLACEMENT_CHAR)
.collect::<String>() .collect::<String>()
.into() .into()
} else { } else {
placeholder.into() self.placeholder().into()
} }
}, },
_ => { _ => {
let text = unsafe { get_raw_textinput_value(self) }; let text = self.get_raw_textinput_value();
if !text.is_empty() { if !text.is_empty() {
text.into() text.into()
} else { } else {
placeholder.into() self.placeholder().into()
} }
}, },
} }
} }
#[allow(unrooted_must_root)]
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn size_for_layout(self) -> u32 { fn size_for_layout(self) -> u32 {
(*self.unsafe_get()).size.get() unsafe { self.unsafe_get().size.get() }
} }
#[allow(unrooted_must_root)]
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn selection_for_layout(self) -> Option<Range<usize>> { unsafe fn selection_for_layout(self) -> Option<Range<usize>> {
if !(*self.unsafe_get()).upcast::<Element>().focus_state() { if !(*self.unsafe_get()).upcast::<Element>().focus_state() {
@ -781,9 +786,9 @@ impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElem
let textinput = (*self.unsafe_get()).textinput.borrow_for_layout(); let textinput = (*self.unsafe_get()).textinput.borrow_for_layout();
match (*self.unsafe_get()).input_type() { match self.input_type() {
InputType::Password => { InputType::Password => {
let text = get_raw_textinput_value(self); let text = self.get_raw_textinput_value();
let sel = UTF8Bytes::unwrap_range(textinput.sorted_selection_offsets_range()); let sel = UTF8Bytes::unwrap_range(textinput.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.
@ -800,17 +805,13 @@ impl<'dom> LayoutHTMLInputElementHelpers<'dom> for LayoutDom<'dom, HTMLInputElem
} }
} }
#[allow(unrooted_must_root)] fn checked_state_for_layout(self) -> bool {
#[allow(unsafe_code)]
unsafe fn checked_state_for_layout(self) -> bool {
self.upcast::<Element>() self.upcast::<Element>()
.get_state_for_layout() .get_state_for_layout()
.contains(ElementState::IN_CHECKED_STATE) .contains(ElementState::IN_CHECKED_STATE)
} }
#[allow(unrooted_must_root)] fn indeterminate_state_for_layout(self) -> bool {
#[allow(unsafe_code)]
unsafe fn indeterminate_state_for_layout(self) -> bool {
self.upcast::<Element>() self.upcast::<Element>()
.get_state_for_layout() .get_state_for_layout()
.contains(ElementState::IN_INDETERMINATE_STATE) .contains(ElementState::IN_INDETERMINATE_STATE)