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

Updates WPT to expect newly passing tests

Browse source 
Addresses reviews

More review addressing
This commit is contained in:
Matthew Rasmus 2014-11-29 14:03:33 -08:00
parent 29241699fd
commit ed37b53a62
5 changed files with 13 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/construct.rs
View file

@ -274,8 +274,7 @@ impl<'a> FlowConstructor<'a> {
TableColumnFragment(TableColumnFragmentInfo::new(node))
}
Some(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) |
Some(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) |
Some(ElementNodeTypeId(HTMLTextAreaElementTypeId)) => TableCellFragment,
Some(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) => TableCellFragment,
Some(ElementNodeTypeId(HTMLTableRowElementTypeId)) |
Some(ElementNodeTypeId(HTMLTableSectionElementTypeId)) => TableRowFragment,
Some(TextNodeTypeId) => UnscannedTextFragment(UnscannedTextFragmentInfo::new(node)),

2
components/layout/lib.rs
View file

@ -5,7 +5,7 @@
#![comment = "The Servo Parallel Browser Project"]
#![license = "MPL"]
#![feature(globs, macro_rules, phase, thread_local, unsafe_destructor)]
#![feature(globs, macro_rules, phase, thread_local, unsafe_destructor, if_let)]
#![deny(unused_imports)]
#![deny(unused_variables)]

18
components/layout/wrapper.rs
View file

@ -184,16 +184,14 @@ impl<'ln> TLayoutNode for LayoutNode<'ln> {
fn text(&self) -> String {
unsafe {
let text_opt: Option<JS<Text>> = TextCast::to_js(self.get_jsmanaged());
match text_opt {
Some(text) => (*text.unsafe_get()).characterdata().data_for_layout().to_string(),
None => match HTMLInputElementCast::to_js(self.get_jsmanaged()) {
Some(input) => input.get_value_for_layout(),
None => match HTMLTextAreaElementCast::to_js(self.get_jsmanaged()) {
Some(area) => area.get_value_for_layout(),
None => panic!("not text!")
}
}
if let Some(text) = TextCast::to_js(self.get_jsmanaged()) {
(*text.unsafe_get()).characterdata().data_for_layout().to_string()
} else if let Some(input) = HTMLInputElementCast::to_js(self.get_jsmanaged()) {
input.get_value_for_layout()
} else if let Some(area) = HTMLTextAreaElementCast::to_js(self.get_jsmanaged()) {
area.get_value_for_layout()
} else {
panic!("not text!")
}
}
}

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

@ -139,11 +139,11 @@ impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> {
}
}
pub trait HTMLTextAreaElementHelpers {
trait PrivateHTMLTextAreaElementHelpers {
fn force_relayout(self);
}
impl<'a> HTMLTextAreaElementHelpers for JSRef<'a, HTMLTextAreaElement> {
impl<'a> PrivateHTMLTextAreaElementHelpers for JSRef<'a, HTMLTextAreaElement> {
fn force_relayout(self) {
let doc = document_from_node(self).root();
let node: JSRef<Node> = NodeCast::from_ref(self);
@ -223,7 +223,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> {
}
if child.is_text() {
self.SetValue(child.GetTextContent().unwrap());
self.SetValue(self.DefaultValue());
}
}