aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-02-28 11:37:40 -0500
committerbors-servo <release+servo@mozilla.com>2014-02-28 11:37:40 -0500
commit021d32368d569298da619041c9ffe262c91063e4 (patch)
tree40535f318ac36d9d617044dc83933b1d27ad1d9f /src/components/script/dom/htmliframeelement.rs
parentdef5483579fad1e7f77ca96bd10fc5eb85e37740 (diff)
parent39e571ae4e23e7c2b96f33773c0c1ea057968487 (diff)
downloadservo-021d32368d569298da619041c9ffe262c91063e4.tar.gz
servo-021d32368d569298da619041c9ffe262c91063e4.zip
auto merge of #1781 : hgentry/servo/mozilla-servo, r=metajack
Simple change. I hope I'm using github correctly; I'm not too familiar with the PR system. Fixes #1777.
Diffstat (limited to 'src/components/script/dom/htmliframeelement.rs')
-rw-r--r--src/components/script/dom/htmliframeelement.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs
index 46fb91a6239..160ecc6c175 100644
--- a/src/components/script/dom/htmliframeelement.rs
+++ b/src/components/script/dom/htmliframeelement.rs
@@ -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
},