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

Move more unsafe layout calls onto LayoutJS.

Browse source
This commit is contained in:
Eli Friedman 2015-11-08 00:30:34 -08:00
parent 5293afc122
commit af78173243
2 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ use dom::htmllabelelement::HTMLLabelElement;
use dom::htmllegendelement::HTMLLegendElement; use dom::htmllegendelement::HTMLLegendElement;
use dom::htmloptgroupelement::HTMLOptGroupElement; use dom::htmloptgroupelement::HTMLOptGroupElement;
use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementLayoutHelpers}; use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementLayoutHelpers};
use dom::htmltableelement::HTMLTableElement; use dom::htmltableelement::{HTMLTableElement, HTMLTableElementLayoutHelpers};
use dom::htmltablerowelement::HTMLTableRowElement; use dom::htmltablerowelement::HTMLTableRowElement;
use dom::htmltablesectionelement::HTMLTableSectionElement; use dom::htmltablesectionelement::HTMLTableSectionElement;
use dom::htmltemplateelement::HTMLTemplateElement; use dom::htmltemplateelement::HTMLTemplateElement;
@ -276,7 +276,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
let bgcolor = if let Some(this) = self.downcast::<HTMLBodyElement>() { let bgcolor = if let Some(this) = self.downcast::<HTMLBodyElement>() {
this.get_background_color() this.get_background_color()
} else if let Some(this) = self.downcast::<HTMLTableElement>() { } else if let Some(this) = self.downcast::<HTMLTableElement>() {
(*this.unsafe_get()).get_background_color() this.get_background_color()
} else if let Some(this) = self.downcast::<HTMLTableCellElement>() { } else if let Some(this) = self.downcast::<HTMLTableCellElement>() {
this.get_background_color() this.get_background_color()
} else if let Some(this) = self.downcast::<HTMLTableRowElement>() { } else if let Some(this) = self.downcast::<HTMLTableRowElement>() {
@ -355,7 +355,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
} }
let cellspacing = if let Some(this) = self.downcast::<HTMLTableElement>() { let cellspacing = if let Some(this) = self.downcast::<HTMLTableElement>() {
(*this.unsafe_get()).get_cellspacing() this.get_cellspacing()
} else { } else {
None None
}; };
@ -400,7 +400,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
let width = if let Some(this) = self.downcast::<HTMLIFrameElement>() { let width = if let Some(this) = self.downcast::<HTMLIFrameElement>() {
this.get_width() this.get_width()
} else if let Some(this) = self.downcast::<HTMLTableElement>() { } else if let Some(this) = self.downcast::<HTMLTableElement>() {
(*this.unsafe_get()).get_width() this.get_width()
} else if let Some(this) = self.downcast::<HTMLTableCellElement>() { } else if let Some(this) = self.downcast::<HTMLTableCellElement>() {
this.get_width() this.get_width()
} else { } else {
@ -490,7 +490,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
let border = if let Some(this) = self.downcast::<HTMLTableElement>() { let border = if let Some(this) = self.downcast::<HTMLTableElement>() {
(*this.unsafe_get()).get_border() this.get_border()
} else { } else {
None None
}; };

44
components/script/dom/htmltableelement.rs
View file

@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::HTMLTableElementBinding;
use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods; use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods;
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{Root, RootedReference}; use dom::bindings::js::{LayoutJS, Root, RootedReference};
use dom::document::Document; use dom::document::Document;
use dom::element::{AttributeMutation, Element}; use dom::element::{AttributeMutation, Element};
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
@ -47,6 +47,10 @@ impl HTMLTableElement {
let element = HTMLTableElement::new_inherited(localName, prefix, document); let element = HTMLTableElement::new_inherited(localName, prefix, document);
Node::reflect_node(box element, document, HTMLTableElementBinding::Wrap) Node::reflect_node(box element, document, HTMLTableElementBinding::Wrap)
} }
pub fn get_border(&self) -> Option<u32> {
self.border.get()
}
} }
impl HTMLTableElementMethods for HTMLTableElement { impl HTMLTableElementMethods for HTMLTableElement {
@ -115,22 +119,40 @@ impl HTMLTableElementMethods for HTMLTableElement {
make_setter!(SetBgColor, "bgcolor"); make_setter!(SetBgColor, "bgcolor");
} }
pub trait HTMLTableElementLayoutHelpers {
impl HTMLTableElement { fn get_background_color(&self) -> Option<RGBA>;
pub fn get_background_color(&self) -> Option<RGBA> { fn get_border(&self) -> Option<u32>;
self.background_color.get() fn get_cellspacing(&self) -> Option<u32>;
fn get_width(&self) -> LengthOrPercentageOrAuto;
} }
pub fn get_border(&self) -> Option<u32> { impl HTMLTableElementLayoutHelpers for LayoutJS<HTMLTableElement> {
self.border.get() #[allow(unsafe_code)]
fn get_background_color(&self) -> Option<RGBA> {
unsafe {
(*self.unsafe_get()).background_color.get()
}
} }
pub fn get_cellspacing(&self) -> Option<u32> { #[allow(unsafe_code)]
self.cellspacing.get() fn get_border(&self) -> Option<u32> {
unsafe {
(*self.unsafe_get()).border.get()
}
} }
pub fn get_width(&self) -> LengthOrPercentageOrAuto { #[allow(unsafe_code)]
self.width.get() fn get_cellspacing(&self) -> Option<u32> {
unsafe {
(*self.unsafe_get()).cellspacing.get()
}
}
#[allow(unsafe_code)]
fn get_width(&self) -> LengthOrPercentageOrAuto {
unsafe {
(*self.unsafe_get()).width.get()
}
} }
} }