1 files changed, 16 insertions, 16 deletions

diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index acedfec4444..a051d1d3245 100644
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -8,16 +8,16 @@ use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
 use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding;
 use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding::HTMLTextAreaElementMethods;
 use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
-use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetCast};
-use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLFieldSetElementDerived};
-use dom::bindings::codegen::InheritTypes::{KeyboardEventCast, NodeCast};
+use dom::bindings::conversions::Castable;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{LayoutJS, Root};
 use dom::bindings::refcounted::Trusted;
 use dom::document::Document;
-use dom::element::{AttributeMutation, IN_ENABLED_STATE};
+use dom::element::{AttributeMutation, IN_ENABLED_STATE, Element};
 use dom::event::{Event, EventBubbles, EventCancelable};
+use dom::eventtarget::EventTarget;
 use dom::htmlelement::HTMLElement;
+use dom::htmlfieldsetelement::HTMLFieldSetElement;
 use dom::htmlformelement::{FormControl, HTMLFormElement};
 use dom::keyboardevent::KeyboardEvent;
 use dom::node::{ChildrenMutation, Node, NodeDamage};
@@ -169,13 +169,13 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-textarea-defaultvalue
     fn DefaultValue(&self) -> DOMString {
-        let node = NodeCast::from_ref(self);
+        let node = self.upcast::<Node>();
         node.GetTextContent().unwrap()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-textarea-defaultvalue
     fn SetDefaultValue(&self, value: DOMString) {
-        let node = NodeCast::from_ref(self);
+        let node = self.upcast::<Node>();
         node.SetTextContent(Some(value));
 
         // if the element's dirty value flag is false, then the element's
@@ -218,7 +218,7 @@ impl HTMLTextAreaElement {
 impl HTMLTextAreaElement {
     fn force_relayout(&self) {
         let doc = document_from_node(self);
-        let node = NodeCast::from_ref(self);
+        let node = self.upcast::<Node>();
         doc.r().content_changed(node, NodeDamage::OtherNodeDamage)
     }
 
@@ -230,14 +230,14 @@ impl HTMLTextAreaElement {
                                EventBubbles::DoesNotBubble,
                                EventCancelable::NotCancelable);
 
-        let target = EventTargetCast::from_ref(self);
+        let target = self.upcast::<EventTarget>();
         target.dispatch_event(event.r());
     }
 }
 
 impl VirtualMethods for HTMLTextAreaElement {
     fn super_type(&self) -> Option<&VirtualMethods> {
-        let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
+        let htmlelement: &HTMLElement = self.upcast::<HTMLElement>();
         Some(htmlelement as &VirtualMethods)
     }
 
@@ -245,7 +245,7 @@ impl VirtualMethods for HTMLTextAreaElement {
         self.super_type().unwrap().attribute_mutated(attr, mutation);
         match attr.local_name() {
             &atom!(disabled) => {
-                let el = ElementCast::from_ref(self);
+                let el = self.upcast::<Element>();
                 match mutation {
                     AttributeMutation::Set(_) => {
                         el.set_disabled_state(true);
@@ -279,7 +279,7 @@ impl VirtualMethods for HTMLTextAreaElement {
             s.bind_to_tree(tree_in_doc);
         }
 
-        let el = ElementCast::from_ref(self);
+        let el = self.upcast::<Element>();
         el.check_ancestors_disabled_state_for_form_control();
     }
 
@@ -296,9 +296,9 @@ impl VirtualMethods for HTMLTextAreaElement {
             s.unbind_from_tree(tree_in_doc);
         }
 
-        let node = NodeCast::from_ref(self);
-        let el = ElementCast::from_ref(self);
-        if node.ancestors().any(|ancestor| ancestor.r().is_htmlfieldsetelement()) {
+        let node = self.upcast::<Node>();
+        let el = self.upcast::<Element>();
+        if node.ancestors().any(|ancestor| ancestor.r().is::<HTMLFieldSetElement>()) {
             el.check_ancestors_disabled_state_for_form_control();
         } else {
             el.check_disabled_attribute();
@@ -324,9 +324,9 @@ impl VirtualMethods for HTMLTextAreaElement {
             //TODO: set the editing position for text inputs
 
             let doc = document_from_node(self);
-            doc.r().request_focus(ElementCast::from_ref(self));
+            doc.r().request_focus(self.upcast::<Element>());
         } else if &*event.Type() == "keydown" && !event.DefaultPrevented() {
-            let keyevent: Option<&KeyboardEvent> = KeyboardEventCast::to_ref(event);
+            let keyevent: Option<&KeyboardEvent> = event.downcast::<KeyboardEvent>();
             keyevent.map(|kevent| {
                 match self.textinput.borrow_mut().handle_keydown(kevent) {
                     KeyReaction::TriggerDefaultAction => (),