From f85b9e37cc121544bd4c2ebe434e717eb3a3d953 Mon Sep 17 00:00:00 2001 From: Megha Gupta Date: Sun, 28 Dec 2014 15:44:03 +0530 Subject: Add HTMLElementTypeId enum (fixes #3625) --- components/script/dom/htmlscriptelement.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'components/script/dom/htmlscriptelement.rs') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 17c9820a344..58607703448 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -16,10 +16,11 @@ use dom::bindings::codegen::InheritTypes::EventTargetCast; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary, OptionalRootable}; use dom::document::Document; -use dom::element::{ElementTypeId, Element, AttributeHandlers, ElementCreator}; +use dom::element::{Element, AttributeHandlers, ElementCreator}; use dom::eventtarget::{EventTarget, EventTargetTypeId, EventTargetHelpers}; use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; -use dom::htmlelement::HTMLElement; +use dom::element::ElementTypeId; +use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node, CloneChildrenFlag}; use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; @@ -55,7 +56,7 @@ pub struct HTMLScriptElement { impl HTMLScriptElementDerived for EventTarget { fn is_htmlscriptelement(&self) -> bool { - *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLScriptElement)) + *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLScriptElement))) } } @@ -63,7 +64,7 @@ impl HTMLScriptElement { fn new_inherited(localName: DOMString, prefix: Option, document: JSRef, creator: ElementCreator) -> HTMLScriptElement { HTMLScriptElement { - htmlelement: HTMLElement::new_inherited(ElementTypeId::HTMLScriptElement, localName, prefix, document), + htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLScriptElement, localName, prefix, document), already_started: Cell::new(false), parser_inserted: Cell::new(creator == ElementCreator::ParserCreated), non_blocking: Cell::new(creator != ElementCreator::ParserCreated), -- cgit v1.2.3