diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-15 07:46:03 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-15 07:46:03 -0800 |
commit | 34fb10bd406cd71cd76840b539faed20b33791a0 (patch) | |
tree | 71e294db73ca496f84c08cd20aaba05518f65248 /components/script/dom/filereader.rs | |
parent | 4f10a0f2e1ae545649957cc7e305c8cb81312759 (diff) | |
parent | 67c572af37ac6dd170414b3dfc34dfdf21da8015 (diff) | |
download | servo-34fb10bd406cd71cd76840b539faed20b33791a0.tar.gz servo-34fb10bd406cd71cd76840b539faed20b33791a0.zip |
Auto merge of #15563 - servo:update-js, r=nox
Update js.
Fixes #15553.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15563)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/filereader.rs')
-rw-r--r-- | components/script/dom/filereader.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 039d516db6e..f97f14480c3 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -27,7 +27,7 @@ use js::jsapi::Heap; use js::jsapi::JSAutoCompartment; use js::jsapi::JSContext; use js::jsval::{self, JSVal}; -use js::typedarray::ArrayBuffer; +use js::typedarray::{ArrayBuffer, CreateWith}; use rustc_serialize::base64::{CharacterSet, Config, Newline, ToBase64}; use script_thread::RunnableWrapper; use servo_atoms::Atom; @@ -269,7 +269,7 @@ impl FileReader { cx: *mut JSContext, _: ReadMetaData, bytes: &[u8]) { unsafe { rooted!(in(cx) let mut array_buffer = ptr::null_mut()); - assert!(ArrayBuffer::create(cx, bytes.len() as u32, Some(bytes), array_buffer.handle_mut()).is_ok()); + assert!(ArrayBuffer::create(cx, CreateWith::Slice(bytes), array_buffer.handle_mut()).is_ok()); *result.borrow_mut() = Some(FileReaderResult::ArrayBuffer(Heap::default())); |