aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/filereader.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-09-13 11:53:42 -0600
committerbors-servo <metajack+bors@gmail.com>2015-09-13 11:53:42 -0600
commitd5ee58caf269779e86b2efc50ddf37d3e4eba9b9 (patch)
tree38bbc198ed997286c8ccdd388292f84071409520 /components/script/dom/filereader.rs
parent6a21bcd9c561d728bab5220bb5b9d5058c34e8c8 (diff)
parentc25085f68a86e2885d77146add097f9f796c96ac (diff)
downloadservo-d5ee58caf269779e86b2efc50ddf37d3e4eba9b9.tar.gz
servo-d5ee58caf269779e86b2efc50ddf37d3e4eba9b9.zip
Auto merge of #7606 - nox:move-typeid, r=jdm
Move the type_id fields to DOMClass Cc @michaelwu. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7606) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/filereader.rs')
-rw-r--r--components/script/dom/filereader.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs
index ffd74806c04..5de6f4dd5f9 100644
--- a/components/script/dom/filereader.rs
+++ b/components/script/dom/filereader.rs
@@ -15,7 +15,7 @@ use dom::bindings::utils::{reflect_dom_object, Reflectable};
use dom::blob::Blob;
use dom::domexception::{DOMException, DOMErrorName};
use dom::event::{EventCancelable, EventBubbles};
-use dom::eventtarget::{EventTarget, EventTargetTypeId};
+use dom::eventtarget::EventTarget;
use dom::progressevent::ProgressEvent;
use encoding::all::UTF_8;
use encoding::label::encoding_from_whatwg_label;
@@ -80,7 +80,7 @@ pub struct FileReader {
impl FileReader {
pub fn new_inherited(global: GlobalRef) -> FileReader {
FileReader {
- eventtarget: EventTarget::new_inherited(EventTargetTypeId::FileReader),//?
+ eventtarget: EventTarget::new_inherited(),//?
global: GlobalField::from_rooted(&global),
ready_state: Cell::new(FileReaderReadyState::Empty),
error: MutNullableHeap::new(None),