mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
Makes layout respect <textarea> rows attribute
review addresssing
This commit is contained in:
parent
2c7f6076d1
commit
fc0748f50e
4 changed files with 44 additions and 6 deletions
|
@ -50,8 +50,8 @@ use dom::virtualmethods::{VirtualMethods, vtable_for};
|
|||
use devtools_traits::AttrInfo;
|
||||
use style::{mod, AuthorOrigin, BgColorSimpleColorAttribute, BorderUnsignedIntegerAttribute};
|
||||
use style::{ColSpanUnsignedIntegerAttribute, IntegerAttribute, LengthAttribute, ParserContext};
|
||||
use style::{SimpleColorAttribute, SizeIntegerAttribute, ColsIntegerAttribute, UnsignedIntegerAttribute};
|
||||
use style::{WidthLengthAttribute, matches};
|
||||
use style::{SimpleColorAttribute, SizeIntegerAttribute, ColsIntegerAttribute, RowsIntegerAttribute};
|
||||
use style::{UnsignedIntegerAttribute, WidthLengthAttribute, matches};
|
||||
use servo_util::namespace;
|
||||
use servo_util::str::{DOMString, LengthOrPercentageOrAuto};
|
||||
|
||||
|
@ -331,6 +331,13 @@ impl RawLayoutElementHelpers for Element {
|
|||
let this: &HTMLTextAreaElement = mem::transmute(self);
|
||||
Some(this.get_cols_for_layout() as i32)
|
||||
}
|
||||
RowsIntegerAttribute => {
|
||||
if !self.is_htmltextareaelement() {
|
||||
panic!("I'm not a textarea element!")
|
||||
}
|
||||
let this: &HTMLTextAreaElement = mem::transmute(self);
|
||||
Some(this.get_rows_for_layout() as i32)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -35,6 +35,7 @@ pub struct HTMLTextAreaElement {
|
|||
htmlelement: HTMLElement,
|
||||
textinput: DOMRefCell<TextInput>,
|
||||
cols: Cell<u32>,
|
||||
rows: Cell<u32>,
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/forms.html#concept-textarea-dirty
|
||||
value_changed: Cell<bool>,
|
||||
|
@ -52,6 +53,7 @@ pub trait LayoutHTMLTextAreaElementHelpers {
|
|||
|
||||
pub trait RawLayoutHTMLTextAreaElementHelpers {
|
||||
unsafe fn get_cols_for_layout(&self) -> u32;
|
||||
unsafe fn get_rows_for_layout(&self) -> u32;
|
||||
}
|
||||
|
||||
impl LayoutHTMLTextAreaElementHelpers for JS<HTMLTextAreaElement> {
|
||||
|
@ -66,6 +68,11 @@ impl RawLayoutHTMLTextAreaElementHelpers for HTMLTextAreaElement {
|
|||
unsafe fn get_cols_for_layout(&self) -> u32 {
|
||||
self.cols.get()
|
||||
}
|
||||
|
||||
#[allow(unrooted_must_root)]
|
||||
unsafe fn get_rows_for_layout(&self) -> u32 {
|
||||
self.rows.get()
|
||||
}
|
||||
}
|
||||
|
||||
static DEFAULT_COLS: u32 = 20;
|
||||
|
@ -77,6 +84,7 @@ impl HTMLTextAreaElement {
|
|||
htmlelement: HTMLElement::new_inherited(HTMLTextAreaElementTypeId, localName, prefix, document),
|
||||
textinput: DOMRefCell::new(TextInput::new(Multiple, "".to_string())),
|
||||
cols: Cell::new(DEFAULT_COLS),
|
||||
rows: Cell::new(DEFAULT_ROWS),
|
||||
value_changed: Cell::new(false),
|
||||
}
|
||||
}
|
||||
|
@ -205,6 +213,12 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> {
|
|||
_ => panic!("Expected a UIntAttrValue"),
|
||||
}
|
||||
},
|
||||
&atom!("rows") => {
|
||||
match *attr.value() {
|
||||
UIntAttrValue(_, value) => self.rows.set(value),
|
||||
_ => panic!("Expected a UIntAttrValue"),
|
||||
}
|
||||
},
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
|
@ -225,6 +239,9 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> {
|
|||
&atom!("cols") => {
|
||||
self.cols.set(DEFAULT_COLS);
|
||||
},
|
||||
&atom!("rows") => {
|
||||
self.rows.set(DEFAULT_ROWS);
|
||||
},
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue