diff options
author | bors-servo <release+servo@mozilla.com> | 2014-05-03 14:25:22 -0400 |
---|---|---|
committer | bors-servo <release+servo@mozilla.com> | 2014-05-03 14:25:22 -0400 |
commit | 731e66ff132e41cdc49bc5324c0e15be19c46ec2 (patch) | |
tree | ccce9b42e8a6c54245e53620082efe0b9840eae1 /src/components/script/dom/htmltablerowelement.rs | |
parent | 4051a8096d7ba7e7f9c86e76d0b4bffd83e85805 (diff) | |
parent | 91278da9dd55582401154e07f9eea34425a332c2 (diff) | |
download | servo-731e66ff132e41cdc49bc5324c0e15be19c46ec2.tar.gz servo-731e66ff132e41cdc49bc5324c0e15be19c46ec2.zip |
auto merge of #2101 : jdm/servo/newroot_rebase, r=Ms2ger
As described in #1764, this strategy uses the following properties:
* DOM members are `JS<T>` types. These cannot be used with being explicitly rooted, but they are required for compiler-derived trace hooks.
* Methods that take DOM type arguments receive `&[mut] JSRef<T>`. These are rooted value references that are cloneable but cannot escape.
* Methods that return DOM values use `Unrooted<T>`. These are values that may or may not be rooted elsewhere, but callers must root them in order to interact with them in any way. One unsoundness hole exists - `Unrooted` values must be rooted ASAP, or there exists the danger that JSAPI calls could be made that could cause the underlying JS value to be GCed.
* All methods are implemented on `JSRef<T>`, enforcing the requirement that all DOM values are rooted for the duration of a method call (with a few exceptions for layout-related code, which cannot root values and therefore interacts with `JS<T>` and `&T` values - this is safe under the assumption that layout code interacts with DOM nodes that are in the tree, therefore rooted, and does not run concurrently with content code)
Diffstat (limited to 'src/components/script/dom/htmltablerowelement.rs')
-rw-r--r-- | src/components/script/dom/htmltablerowelement.rs | 58 |
1 files changed, 38 insertions, 20 deletions
diff --git a/src/components/script/dom/htmltablerowelement.rs b/src/components/script/dom/htmltablerowelement.rs index aa46e96524f..053735b5f40 100644 --- a/src/components/script/dom/htmltablerowelement.rs +++ b/src/components/script/dom/htmltablerowelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::BindingDeclarations::HTMLTableRowElementBinding; use dom::bindings::codegen::InheritTypes::HTMLTableRowElementDerived; -use dom::bindings::js::JS; +use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::error::ErrorResult; use dom::document::Document; use dom::element::HTMLTableRowElementTypeId; @@ -28,76 +28,94 @@ impl HTMLTableRowElementDerived for EventTarget { } impl HTMLTableRowElement { - pub fn new_inherited(localName: DOMString, document: JS<Document>) -> HTMLTableRowElement { + pub fn new_inherited(localName: DOMString, document: &JSRef<Document>) -> HTMLTableRowElement { HTMLTableRowElement { htmlelement: HTMLElement::new_inherited(HTMLTableRowElementTypeId, localName, document) } } - pub fn new(localName: DOMString, document: &JS<Document>) -> JS<HTMLTableRowElement> { - let element = HTMLTableRowElement::new_inherited(localName, document.clone()); + pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableRowElement> { + let element = HTMLTableRowElement::new_inherited(localName, document); Node::reflect_node(~element, document, HTMLTableRowElementBinding::Wrap) } } -impl HTMLTableRowElement { - pub fn RowIndex(&self) -> i32 { +pub trait HTMLTableRowElementMethods { + fn RowIndex(&self) -> i32; + fn GetRowIndex(&self) -> i32; + fn SectionRowIndex(&self) -> i32; + fn GetSectionRowIndex(&self) -> i32; + fn DeleteCell(&mut self, _index: i32) -> ErrorResult; + fn Align(&self) -> DOMString; + fn SetAlign(&self, _align: DOMString) -> ErrorResult; + fn Ch(&self) -> DOMString; + fn SetCh(&self, _ch: DOMString) -> ErrorResult; + fn ChOff(&self) -> DOMString; + fn SetChOff(&self, _ch_off: DOMString) -> ErrorResult; + fn VAlign(&self) -> DOMString; + fn SetVAlign(&self, _v_align: DOMString) -> ErrorResult; + fn BgColor(&self) -> DOMString; + fn SetBgColor(&self, _bg_color: DOMString) -> ErrorResult; +} + +impl<'a> HTMLTableRowElementMethods for JSRef<'a, HTMLTableRowElement> { + fn RowIndex(&self) -> i32 { 0 } - pub fn GetRowIndex(&self) -> i32 { + fn GetRowIndex(&self) -> i32 { 0 } - pub fn SectionRowIndex(&self) -> i32 { + fn SectionRowIndex(&self) -> i32 { 0 } - pub fn GetSectionRowIndex(&self) -> i32 { + fn GetSectionRowIndex(&self) -> i32 { 0 } - pub fn DeleteCell(&mut self, _index: i32) -> ErrorResult { + fn DeleteCell(&mut self, _index: i32) -> ErrorResult { Ok(()) } - pub fn Align(&self) -> DOMString { + fn Align(&self) -> DOMString { ~"" } - pub fn SetAlign(&self, _align: DOMString) -> ErrorResult { + fn SetAlign(&self, _align: DOMString) -> ErrorResult { Ok(()) } - pub fn Ch(&self) -> DOMString { + fn Ch(&self) -> DOMString { ~"" } - pub fn SetCh(&self, _ch: DOMString) -> ErrorResult { + fn SetCh(&self, _ch: DOMString) -> ErrorResult { Ok(()) } - pub fn ChOff(&self) -> DOMString { + fn ChOff(&self) -> DOMString { ~"" } - pub fn SetChOff(&self, _ch_off: DOMString) -> ErrorResult { + fn SetChOff(&self, _ch_off: DOMString) -> ErrorResult { Ok(()) } - pub fn VAlign(&self) -> DOMString { + fn VAlign(&self) -> DOMString { ~"" } - pub fn SetVAlign(&self, _v_align: DOMString) -> ErrorResult { + fn SetVAlign(&self, _v_align: DOMString) -> ErrorResult { Ok(()) } - pub fn BgColor(&self) -> DOMString { + fn BgColor(&self) -> DOMString { ~"" } - pub fn SetBgColor(&self, _bg_color: DOMString) -> ErrorResult { + fn SetBgColor(&self, _bg_color: DOMString) -> ErrorResult { Ok(()) } } |