From 2c7c8fd2be582b12bbe0d450ba9c9325db79840a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 19 Jan 2017 15:38:37 +0100 Subject: [PATCH] Use an ArrayBuffer to implement readAsArrayBuffer. --- components/script/dom/filereader.rs | 4 ++-- .../filereader_readAsArrayBuffer.html.ini | 5 ----- .../FileAPI/reading-data-section/filereader_result.html.ini | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 tests/wpt/metadata/FileAPI/reading-data-section/filereader_readAsArrayBuffer.html.ini delete mode 100644 tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 9b5c39b013c..039d516db6e 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::Uint8Array; +use js::typedarray::ArrayBuffer; 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!(Uint8Array::create(cx, bytes.len() as u32, Some(bytes), array_buffer.handle_mut()).is_ok()); + assert!(ArrayBuffer::create(cx, bytes.len() as u32, Some(bytes), array_buffer.handle_mut()).is_ok()); *result.borrow_mut() = Some(FileReaderResult::ArrayBuffer(Heap::default())); diff --git a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_readAsArrayBuffer.html.ini b/tests/wpt/metadata/FileAPI/reading-data-section/filereader_readAsArrayBuffer.html.ini deleted file mode 100644 index ee637898bde..00000000000 --- a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_readAsArrayBuffer.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[filereader_readAsArrayBuffer.html] - type: testharness - [FileAPI Test: filereader_readAsArrayBuffer] - expected: FAIL - diff --git a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini b/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini deleted file mode 100644 index 415751e1ead..00000000000 --- a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[filereader_result.html] - type: testharness - [readAsArrayBuffer] - expected: FAIL -