diff options
8 files changed, 12 insertions, 38 deletions
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/idlharness.html.ini b/tests/wpt/metadata/FileAPI/idlharness.html.ini index 645001eb1c0..f4c97314499 100644 --- a/tests/wpt/metadata/FileAPI/idlharness.html.ini +++ b/tests/wpt/metadata/FileAPI/idlharness.html.ini @@ -3,24 +3,6 @@ [URL interface: operation createFor(Blob)] expected: FAIL - [FileReaderSync interface object length] - expected: FAIL - - [FileReaderSync interface: existence and properties of interface prototype object] - expected: FAIL - - [FileReaderSync interface: existence and properties of interface prototype object's "constructor" property] - expected: FAIL - - [FileReaderSync interface: operation readAsArrayBuffer(Blob)] - expected: FAIL - - [FileReaderSync interface: operation readAsText(Blob,DOMString)] - expected: FAIL - - [FileReaderSync interface: operation readAsDataURL(Blob)] - expected: FAIL - [FileReader interface: operation readAsBinaryString(Blob)] expected: FAIL diff --git a/tests/wpt/metadata/FileAPI/reading-data-section/Determining-Encoding.html.ini b/tests/wpt/metadata/FileAPI/reading-data-section/Determining-Encoding.html.ini index 6ef475882e0..1b62c9bc1e0 100644 --- a/tests/wpt/metadata/FileAPI/reading-data-section/Determining-Encoding.html.ini +++ b/tests/wpt/metadata/FileAPI/reading-data-section/Determining-Encoding.html.ini @@ -2,19 +2,25 @@ type: testharness [Blob Determing Encoding with encoding argument] expected: FAIL + bug: https://github.com/servo/servo/issues/10911 [Blob Determing Encoding with type attribute] expected: FAIL + bug: https://github.com/servo/servo/issues/10911 [Blob Determing Encoding with UTF-8 BOM] expected: FAIL + bug: https://github.com/servo/servo/issues/10911 [Blob Determing Encoding without anything implying charset.] expected: FAIL + bug: https://github.com/servo/servo/issues/10911 [Blob Determing Encoding with UTF-16BE BOM] expected: FAIL + bug: https://github.com/servo/servo/issues/10911 [Blob Determing Encoding with UTF-16LE BOM] expected: FAIL + bug: https://github.com/servo/servo/issues/10911 diff --git a/tests/wpt/metadata/FileAPI/reading-data-section/FileReader-multiple-reads.html.ini b/tests/wpt/metadata/FileAPI/reading-data-section/FileReader-multiple-reads.html.ini deleted file mode 100644 index ccfda894482..00000000000 --- a/tests/wpt/metadata/FileAPI/reading-data-section/FileReader-multiple-reads.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[FileReader-multiple-reads.html] - type: testharness - [test FileReader no InvalidStateError exception in onloadstart event for readAsArrayBuffer] - expected: FAIL - 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 - diff --git a/tests/wpt/metadata/FileAPI/url/url_createobjecturl_blob.html.ini b/tests/wpt/metadata/FileAPI/url/url_createobjecturl_blob.html.ini index 92400cd1d65..b49ae1e4dd4 100644 --- a/tests/wpt/metadata/FileAPI/url/url_createobjecturl_blob.html.ini +++ b/tests/wpt/metadata/FileAPI/url/url_createobjecturl_blob.html.ini @@ -2,4 +2,5 @@ type: testharness [Check if the Blob URI starts with 'blob' using createFor()] expected: FAIL + bug: https://github.com/servo/servo/issues/15112 diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-multiple-reads.html b/tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-multiple-reads.html index 86a29d187b5..ca04f3c1819 100644 --- a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-multiple-reads.html +++ b/tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-multiple-reads.html @@ -62,12 +62,12 @@ async_test(function() { var blob_2 = new Blob(['TEST000000002']) var reader = new FileReader(); reader.onloadend = this.step_func_done(function() { - assert_equals(reader.readyState, FileReader.LOADING, - "readyState must be LOADING") + assert_equals(reader.readyState, FileReader.DONE, + "readyState must be DONE") reader.readAsArrayBuffer(blob_2) assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING") }); reader.readAsArrayBuffer(blob_1) assert_equals(reader.readyState, FileReader.LOADING, "readyState Must be LOADING") -}, 'test FileReader no InvalidStateError exception in onloadstart event for readAsArrayBuffer'); +}, 'test FileReader no InvalidStateError exception in loadend event handler for readAsArrayBuffer'); </script> |