diff options
author | Chad Kimes <ckimes89@gmail.com> | 2016-01-10 23:08:55 -0500 |
---|---|---|
committer | Chad Kimes <ckimes89@gmail.com> | 2016-01-11 20:23:47 -0500 |
commit | ce6075825d9e21b9b59d7d7230268745c087d617 (patch) | |
tree | b51757a926deef4e0ac3271b798f0781c407b128 /components/script/dom/filereader.rs | |
parent | 2703568227e9957f3e1d44c3a03646675a285bc3 (diff) | |
download | servo-ce6075825d9e21b9b59d7d7230268745c087d617.tar.gz servo-ce6075825d9e21b9b59d7d7230268745c087d617.zip |
Add global default method for Reflectable trait
Diffstat (limited to 'components/script/dom/filereader.rs')
-rw-r--r-- | components/script/dom/filereader.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 39e978f012e..7c0aa1c2c0c 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::BlobBinding::BlobMethods; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::FileReaderBinding::{self, FileReaderConstants, FileReaderMethods}; use dom::bindings::error::{Error, ErrorResult, Fallible}; -use dom::bindings::global::{GlobalRef, global_root_from_reflector}; +use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::refcounted::Trusted; @@ -112,7 +112,7 @@ impl FileReader { fr.change_ready_state(FileReaderReadyState::Done); *fr.result.borrow_mut() = None; - let global = global_root_from_reflector(fr.r()); + let global = fr.r().global(); let exception = DOMException::new(global.r(), error); fr.error.set(Some(&exception)); @@ -289,7 +289,7 @@ impl FileReaderMethods for FileReader { // Steps 1 & 3 *self.result.borrow_mut() = None; - let global = global_root_from_reflector(self); + let global = self.global(); let exception = DOMException::new(global.r(), DOMErrorName::AbortError); self.error.set(Some(&exception)); @@ -319,7 +319,7 @@ impl FileReaderMethods for FileReader { impl FileReader { fn dispatch_progress_event(&self, type_: Atom, loaded: u64, total: Option<u64>) { - let global = global_root_from_reflector(self); + let global = self.global(); let progressevent = ProgressEvent::new(global.r(), type_, EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, total.is_some(), loaded, total.unwrap_or(0)); @@ -332,7 +332,7 @@ impl FileReader { } fn read(&self, function: FileReaderFunction, blob: &Blob, label: Option<DOMString>) -> ErrorResult { - let root = global_root_from_reflector(self); + let root = self.global(); let global = root.r(); // Step 1 if self.ready_state.get() == FileReaderReadyState::Loading { @@ -340,7 +340,7 @@ impl FileReader { } // Step 2 if blob.IsClosed() { - let global = global_root_from_reflector(self); + let global = self.global(); let exception = DOMException::new(global.r(), DOMErrorName::InvalidStateError); self.error.set(Some(&exception)); |