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

Remove get_ prefix for functions in LayoutHTMLInputElementHelpers

Browse source
This commit is contained in:
Keith Yeung 2016-04-11 09:17:04 -04:00
parent 2d503c8281
commit c9193eaeca
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/wrapper.rs
View file

@ -1050,7 +1050,7 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
return TextContent::Text(data); return TextContent::Text(data);
} }
if let Some(input) = this.downcast::<HTMLInputElement>() { if let Some(input) = this.downcast::<HTMLInputElement>() {
let data = unsafe { input.get_value_for_layout() }; let data = unsafe { input.value_for_layout() };
return TextContent::Text(data); return TextContent::Text(data);
} }
if let Some(area) = this.downcast::<HTMLTextAreaElement>() { if let Some(area) = this.downcast::<HTMLTextAreaElement>() {
@ -1076,7 +1076,7 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
} }
} }
if let Some(input) = this.downcast::<HTMLInputElement>() { if let Some(input) = this.downcast::<HTMLInputElement>() {
if let Some(selection) = unsafe { input.get_selection_for_layout() } { if let Some(selection) = unsafe { input.selection_for_layout() } {
return Some(Range::new(CharIndex(selection.begin()), return Some(Range::new(CharIndex(selection.begin()),
CharIndex(selection.length()))); CharIndex(selection.length())));
} }

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

@ -377,7 +377,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
}, },
// Others // Others
_ => { _ => {
match this.get_size_for_layout() { match this.size_for_layout() {
0 => None, 0 => None,
s => Some(s as i32), s => Some(s as i32),
} }
@ -571,7 +571,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
// TODO option and menuitem can also have a checked state. // TODO option and menuitem can also have a checked state.
match self.downcast::<HTMLInputElement>() { match self.downcast::<HTMLInputElement>() {
Some(input) => unsafe { Some(input) => unsafe {
input.get_checked_state_for_layout() input.checked_state_for_layout()
}, },
None => false, None => false,
} }
@ -583,7 +583,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
// TODO progress elements can also be matched with :indeterminate // TODO progress elements can also be matched with :indeterminate
match self.downcast::<HTMLInputElement>() { match self.downcast::<HTMLInputElement>() {
Some(input) => unsafe { Some(input) => unsafe {
input.get_indeterminate_state_for_layout() input.indeterminate_state_for_layout()
}, },
None => false, None => false,
} }

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

@ -208,15 +208,15 @@ impl HTMLInputElement {
pub trait LayoutHTMLInputElementHelpers { pub trait LayoutHTMLInputElementHelpers {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_value_for_layout(self) -> String; unsafe fn value_for_layout(self) -> String;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_size_for_layout(self) -> u32; unsafe fn size_for_layout(self) -> u32;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_selection_for_layout(self) -> Option<Range<isize>>; unsafe fn selection_for_layout(self) -> Option<Range<isize>>;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_checked_state_for_layout(self) -> bool; unsafe fn checked_state_for_layout(self) -> bool;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_indeterminate_state_for_layout(self) -> bool; unsafe fn indeterminate_state_for_layout(self) -> bool;
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
@ -226,7 +226,7 @@ unsafe fn get_raw_textinput_value(input: LayoutJS<HTMLInputElement>) -> DOMStrin
impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> { impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_value_for_layout(self) -> String { unsafe fn value_for_layout(self) -> String {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_raw_attr_value(input: LayoutJS<HTMLInputElement>, default: &str) -> String { unsafe fn get_raw_attr_value(input: LayoutJS<HTMLInputElement>, default: &str) -> String {
let elem = input.upcast::<Element>(); let elem = input.upcast::<Element>();
@ -245,7 +245,7 @@ impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> {
InputType::InputPassword => { InputType::InputPassword => {
let text = get_raw_textinput_value(self); let text = get_raw_textinput_value(self);
if !text.is_empty() { if !text.is_empty() {
// The implementation of get_selection_for_layout expects a 1:1 mapping of chars. // The implementation of selection_for_layout expects a 1:1 mapping of chars.
text.chars().map(|_| '●').collect() text.chars().map(|_| '●').collect()
} else { } else {
String::from((*self.unsafe_get()).placeholder.borrow_for_layout().clone()) String::from((*self.unsafe_get()).placeholder.borrow_for_layout().clone())
@ -254,7 +254,7 @@ impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> {
_ => { _ => {
let text = get_raw_textinput_value(self); let text = get_raw_textinput_value(self);
if !text.is_empty() { if !text.is_empty() {
// The implementation of get_selection_for_layout expects a 1:1 mapping of chars. // The implementation of selection_for_layout expects a 1:1 mapping of chars.
String::from(text) String::from(text)
} else { } else {
String::from((*self.unsafe_get()).placeholder.borrow_for_layout().clone()) String::from((*self.unsafe_get()).placeholder.borrow_for_layout().clone())
@ -265,19 +265,19 @@ impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> {
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_size_for_layout(self) -> u32 { unsafe fn size_for_layout(self) -> u32 {
(*self.unsafe_get()).size.get() (*self.unsafe_get()).size.get()
} }
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_selection_for_layout(self) -> Option<Range<isize>> { unsafe fn selection_for_layout(self) -> Option<Range<isize>> {
if !(*self.unsafe_get()).upcast::<Element>().focus_state() { if !(*self.unsafe_get()).upcast::<Element>().focus_state() {
return None; return None;
} }
// Use the raw textinput to get the index as long as we use a 1:1 char mapping // Use the raw textinput to get the index as long as we use a 1:1 char mapping
// in get_value_for_layout. // in value_for_layout.
let raw = match (*self.unsafe_get()).input_type.get() { let raw = match (*self.unsafe_get()).input_type.get() {
InputType::InputText | InputType::InputText |
InputType::InputPassword => get_raw_textinput_value(self), InputType::InputPassword => get_raw_textinput_value(self),
@ -293,13 +293,13 @@ impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> {
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_checked_state_for_layout(self) -> bool { unsafe fn checked_state_for_layout(self) -> bool {
self.upcast::<Element>().get_state_for_layout().contains(IN_CHECKED_STATE) self.upcast::<Element>().get_state_for_layout().contains(IN_CHECKED_STATE)
} }
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_indeterminate_state_for_layout(self) -> bool { unsafe fn indeterminate_state_for_layout(self) -> bool {
self.upcast::<Element>().get_state_for_layout().contains(IN_INDETERMINATE_STATE) self.upcast::<Element>().get_state_for_layout().contains(IN_INDETERMINATE_STATE)
} }
} }