diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2015-10-14 17:48:28 -0700 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2015-10-15 14:03:56 -0700 |
commit | 57584e74c6fc192335ed3300ac75751bada0ff93 (patch) | |
tree | a75b0f9045238a8720e31d848433635222a06b58 /components/script/dom/filereader.rs | |
parent | 7a08b29201d7a6ec8fd2097fc60ca47e556898d5 (diff) | |
download | servo-57584e74c6fc192335ed3300ac75751bada0ff93.tar.gz servo-57584e74c6fc192335ed3300ac75751bada0ff93.zip |
Make get() and set() on MutNullableHeap use the correct types.
get() must always return a rooted value, because we have no way of
ensuring the value won't be invalidated. set() takes an &T because it's
convenient; there isn't any need to expose JS<T>.
Diffstat (limited to 'components/script/dom/filereader.rs')
-rw-r--r-- | components/script/dom/filereader.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 3ae20361ab6..a659908f31c 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -116,7 +116,7 @@ impl FileReader { let global = fr.global.root(); let exception = DOMException::new(global.r(), error); - fr.error.set(Some(JS::from_rooted(&exception))); + fr.error.set(Some(&exception)); fr.dispatch_progress_event("error".to_owned(), 0, None); return_on_abort!(); @@ -292,7 +292,7 @@ impl FileReaderMethods for FileReader { let global = self.global.root(); let exception = DOMException::new(global.r(), DOMErrorName::AbortError); - self.error.set(Some(JS::from_rooted(&exception))); + self.error.set(Some(&exception)); self.terminate_ongoing_reading(); // Steps 5 & 6 @@ -346,7 +346,7 @@ impl FileReader { if blob.IsClosed() { let global = self.global.root(); let exception = DOMException::new(global.r(), DOMErrorName::InvalidStateError); - self.error.set(Some(JS::from_rooted(&exception))); + self.error.set(Some(&exception)); self.dispatch_progress_event("error".to_owned(), 0, None); return Ok(()); |