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

Renamed HTMLIframeElementTypeId to HTMLIFrameElementTypeId

Browse source
This commit is contained in:
hgentry 2014-02-27 15:35:27 -05:00
parent ab72c473cd
commit 39e571ae4e
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/layout/construct.rs
View file

@ -36,7 +36,7 @@ use layout::wrapper::{PostorderNodeMutTraversal, TLayoutNode, ThreadSafeLayoutNo
use gfx::font_context::FontContext; use gfx::font_context::FontContext;
use script::dom::bindings::codegen::InheritTypes::TextCast; use script::dom::bindings::codegen::InheritTypes::TextCast;
use script::dom::bindings::js::JS; use script::dom::bindings::js::JS;
use script::dom::element::{HTMLIframeElementTypeId, HTMLImageElementTypeId, HTMLObjectElementTypeId}; use script::dom::element::{HTMLIFrameElementTypeId, HTMLImageElementTypeId, HTMLObjectElementTypeId};
use script::dom::node::{CommentNodeTypeId, DoctypeNodeTypeId, DocumentFragmentNodeTypeId}; use script::dom::node::{CommentNodeTypeId, DoctypeNodeTypeId, DocumentFragmentNodeTypeId};
use script::dom::node::{DocumentNodeTypeId, ElementNodeTypeId, ProcessingInstructionNodeTypeId}; use script::dom::node::{DocumentNodeTypeId, ElementNodeTypeId, ProcessingInstructionNodeTypeId};
use script::dom::node::{TextNodeTypeId}; use script::dom::node::{TextNodeTypeId};
@ -274,7 +274,7 @@ impl<'a> FlowConstructor<'a> {
-> SpecificBoxInfo { -> SpecificBoxInfo {
match node.type_id() { match node.type_id() {
ElementNodeTypeId(HTMLImageElementTypeId) => self.build_box_info_for_image(node, node.image_url()), ElementNodeTypeId(HTMLImageElementTypeId) => self.build_box_info_for_image(node, node.image_url()),
ElementNodeTypeId(HTMLIframeElementTypeId) => IframeBox(IframeBoxInfo::new(node)), ElementNodeTypeId(HTMLIFrameElementTypeId) => IframeBox(IframeBoxInfo::new(node)),
ElementNodeTypeId(HTMLObjectElementTypeId) => { ElementNodeTypeId(HTMLObjectElementTypeId) => {
let data = node.get_object_data(&self.layout_context.url); let data = node.get_object_data(&self.layout_context.url);
self.build_box_info_for_image(node, data) self.build_box_info_for_image(node, data)

6
src/components/script/dom/element.rs
View file

@ -90,7 +90,7 @@ pub enum ElementTypeId {
HTMLHeadElementTypeId, HTMLHeadElementTypeId,
HTMLHeadingElementTypeId, HTMLHeadingElementTypeId,
HTMLHtmlElementTypeId, HTMLHtmlElementTypeId,
HTMLIframeElementTypeId, HTMLIFrameElementTypeId,
HTMLImageElementTypeId, HTMLImageElementTypeId,
HTMLInputElementTypeId, HTMLInputElementTypeId,
HTMLLabelElementTypeId, HTMLLabelElementTypeId,
@ -264,7 +264,7 @@ impl Element {
let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self); let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self);
elem.get_mut().AfterSetAttr(local_name.clone(), value.clone()); elem.get_mut().AfterSetAttr(local_name.clone(), value.clone());
} }
ElementNodeTypeId(HTMLIframeElementTypeId) => { ElementNodeTypeId(HTMLIFrameElementTypeId) => {
let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self); let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self);
elem.get_mut().AfterSetAttr(local_name.clone(), value.clone()); elem.get_mut().AfterSetAttr(local_name.clone(), value.clone());
} }
@ -333,7 +333,7 @@ impl Element {
let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self); let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self);
elem.get_mut().BeforeRemoveAttr(local_name.clone()); elem.get_mut().BeforeRemoveAttr(local_name.clone());
} }
ElementNodeTypeId(HTMLIframeElementTypeId) => { ElementNodeTypeId(HTMLIFrameElementTypeId) => {
let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self); let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self);
elem.get_mut().BeforeRemoveAttr(local_name.clone()); elem.get_mut().BeforeRemoveAttr(local_name.clone());
} }

6
src/components/script/dom/htmliframeelement.rs
View file

@ -7,7 +7,7 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived
use dom::bindings::js::JS; use dom::bindings::js::JS;
use dom::bindings::utils::ErrorResult; use dom::bindings::utils::ErrorResult;
use dom::document::Document; use dom::document::Document;
use dom::element::HTMLIframeElementTypeId; use dom::element::HTMLIFrameElementTypeId;
use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::node::{Node, ElementNodeTypeId}; use dom::node::{Node, ElementNodeTypeId};
@ -49,7 +49,7 @@ impl<S: Encoder> Encodable<S> for Untraceable {
impl HTMLIFrameElementDerived for EventTarget { impl HTMLIFrameElementDerived for EventTarget {
fn is_htmliframeelement(&self) -> bool { fn is_htmliframeelement(&self) -> bool {
match self.type_id { match self.type_id {
NodeTargetTypeId(ElementNodeTypeId(HTMLIframeElementTypeId)) => true, NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) => true,
_ => false _ => false
} }
} }
@ -70,7 +70,7 @@ impl HTMLIFrameElement {
impl HTMLIFrameElement { impl HTMLIFrameElement {
pub fn new_inherited(localName: DOMString, document: JS<Document>) -> HTMLIFrameElement { pub fn new_inherited(localName: DOMString, document: JS<Document>) -> HTMLIFrameElement {
HTMLIFrameElement { HTMLIFrameElement {
htmlelement: HTMLElement::new_inherited(HTMLIframeElementTypeId, localName, document), htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document),
extra: Untraceable { extra: Untraceable {
frame: None frame: None
}, },

4
src/components/script/html/hubbub_html_parser.rs
View file

@ -7,7 +7,7 @@ use dom::bindings::codegen::InheritTypes::HTMLIFrameElementCast;
use dom::bindings::js::JS; use dom::bindings::js::JS;
use dom::bindings::utils::Reflectable; use dom::bindings::utils::Reflectable;
use dom::document::Document; use dom::document::Document;
use dom::element::{HTMLLinkElementTypeId, HTMLIframeElementTypeId}; use dom::element::{HTMLLinkElementTypeId, HTMLIFrameElementTypeId};
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6}; use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6};
use dom::htmliframeelement::IFrameSize; use dom::htmliframeelement::IFrameSize;
@ -350,7 +350,7 @@ pub fn parse_html(cx: *JSContext,
} }
} }
ElementNodeTypeId(HTMLIframeElementTypeId) => { ElementNodeTypeId(HTMLIFrameElementTypeId) => {
let iframe_chan = discovery_chan.clone(); let iframe_chan = discovery_chan.clone();
let mut iframe_element: JS<HTMLIFrameElement> = let mut iframe_element: JS<HTMLIFrameElement> =
HTMLIFrameElementCast::to(&element); HTMLIFrameElementCast::to(&element);