diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-25 23:37:15 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-25 23:37:15 -0800 |
commit | 1c60a5bef84a709491882e22d4e3393de062dea9 (patch) | |
tree | 63b0fce85a86ec5aeb866b08eb8f221f9dd1dafd | |
parent | 42ec8a89747ba1e25769fffae083f62fe9576987 (diff) | |
parent | 684db8bd293e20ea0cd6e59697dfa84ca15fe8b2 (diff) | |
download | servo-1c60a5bef84a709491882e22d4e3393de062dea9.tar.gz servo-1c60a5bef84a709491882e22d4e3393de062dea9.zip |
Auto merge of #14730 - deror1869107:typed_array_API, r=emilio
Rewrite Crypto::GetRandomValues to use typed array API
<!-- Please describe your changes on the following line: -->
Rewrite Crypto::GetRandomValues to use typed array API
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [X] These changes fix #14673 (github issue number if applicable).
<!-- Either: -->
- [X] There are tests for these changes
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/14730)
<!-- Reviewable:end -->
-rw-r--r-- | Cargo.lock | 2 | ||||
-rw-r--r-- | components/script/dom/crypto.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index a85569c59b9..708d7c10694 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1246,7 +1246,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.3" -source = "git+https://github.com/servo/rust-mozjs#342f304a455080acf64f5ceb40a7f8059481ca01" +source = "git+https://github.com/servo/rust-mozjs#15ff1e83446e998112dcde731610e8b60cc32abf" dependencies = [ "cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs index 4120456c77c..57b561e8a58 100644 --- a/components/script/dom/crypto.rs +++ b/components/script/dom/crypto.rs @@ -6,7 +6,6 @@ use core::nonzero::NonZero; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::CryptoBinding; use dom::bindings::codegen::Bindings::CryptoBinding::CryptoMethods; -use dom::bindings::conversions::array_buffer_view_data; use dom::bindings::error::{Error, Fallible}; use dom::bindings::js::Root; use dom::bindings::reflector::{Reflector, reflect_dom_object}; @@ -46,9 +45,10 @@ impl CryptoMethods for Crypto { input: *mut JSObject) -> Fallible<NonZero<*mut JSObject>> { assert!(!input.is_null()); - let mut data = match array_buffer_view_data::<u8>(input) { - Some(data) => data, - None => { + typedarray!(in(_cx) let mut array_buffer_view: ArrayBufferView = input); + let mut data = match array_buffer_view.as_mut() { + Ok(x) => x.as_mut_slice(), + Err(_) => { return Err(Error::Type("Argument to Crypto.getRandomValues is not an ArrayBufferView" .to_owned())); } |