diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index c2396700a68..09cd40022ef 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -8,7 +8,6 @@ use dom::bindings::codegen::InheritTypes::HTMLCanvasElementDerived; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast}; use dom::bindings::global::Window; use dom::bindings::js::{MutNullableJS, JSRef, Temporary, OptionalSettable}; -use dom::bindings::trace::Traceable; use dom::bindings::utils::{Reflectable, Reflector}; use dom::canvasrenderingcontext2d::CanvasRenderingContext2D; use dom::document::Document; @@ -33,9 +32,9 @@ static DefaultHeight: u32 = 150; #[must_root] pub struct HTMLCanvasElement { pub htmlelement: HTMLElement, - context: Traceable>, - width: Traceable>, - height: Traceable>, + context: MutNullableJS, + width: Cell, + height: Cell, } impl HTMLCanvasElementDerived for EventTarget { @@ -48,9 +47,9 @@ impl HTMLCanvasElement { fn new_inherited(localName: DOMString, document: JSRef) -> HTMLCanvasElement { HTMLCanvasElement { htmlelement: HTMLElement::new_inherited(HTMLCanvasElementTypeId, localName, document), - context: Traceable::new(Default::default()), - width: Traceable::new(Cell::new(DefaultWidth)), - height: Traceable::new(Cell::new(DefaultHeight)), + context: Default::default(), + width: Cell::new(DefaultWidth), + height: Cell::new(DefaultHeight), } }