Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 17:14:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1781 : hgentry/servo/mozilla-servo, r=metajack

Browse source 
Simple change. I hope I'm using github correctly; I'm not too familiar with the PR system. Fixes #1777.
This commit is contained in:
bors-servo 2014-02-28 11:37:40 -05:00
commit 021d32368d
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ pub enum ElementTypeId {
HTMLHeadElementTypeId,
HTMLHeadingElementTypeId,
HTMLHtmlElementTypeId,
HTMLIframeElementTypeId,
HTMLIFrameElementTypeId,
HTMLImageElementTypeId,
HTMLInputElementTypeId,
HTMLLabelElementTypeId,
@ -264,7 +264,7 @@ impl Element {
let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self);
elem.get_mut().AfterSetAttr(local_name.clone(), value.clone());
}
ElementNodeTypeId(HTMLIframeElementTypeId) => {
ElementNodeTypeId(HTMLIFrameElementTypeId) => {
let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self);
elem.get_mut().AfterSetAttr(local_name.clone(), value.clone());
}
@ -333,7 +333,7 @@ impl Element {
let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self);
elem.get_mut().BeforeRemoveAttr(local_name.clone());
}
ElementNodeTypeId(HTMLIframeElementTypeId) => {
ElementNodeTypeId(HTMLIFrameElementTypeId) => {
let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self);
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::error::ErrorResult;
use dom::document::Document;
use dom::element::HTMLIframeElementTypeId;
use dom::element::HTMLIFrameElementTypeId;
use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::htmlelement::HTMLElement;
use dom::node::{Node, ElementNodeTypeId};
@ -49,7 +49,7 @@ impl<S: Encoder> Encodable<S> for Untraceable {
impl HTMLIFrameElementDerived for EventTarget {
fn is_htmliframeelement(&self) -> bool {
match self.type_id {
NodeTargetTypeId(ElementNodeTypeId(HTMLIframeElementTypeId)) => true,
NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) => true,
_ => false
}
}
@ -70,7 +70,7 @@ impl HTMLIFrameElement {
impl HTMLIFrameElement {
pub fn new_inherited(localName: DOMString, document: JS<Document>) -> HTMLIFrameElement {
HTMLIFrameElement {
htmlelement: HTMLElement::new_inherited(HTMLIframeElementTypeId, localName, document),
htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document),
extra: Untraceable {
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::utils::Reflectable;
use dom::document::Document;
use dom::element::{HTMLLinkElementTypeId, HTMLIframeElementTypeId};
use dom::element::{HTMLLinkElementTypeId, HTMLIFrameElementTypeId};
use dom::htmlelement::HTMLElement;
use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6};
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 mut iframe_element: JS<HTMLIFrameElement> =
HTMLIFrameElementCast::to(&element);