Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use typed array API in TextDecoder::Decode

Browse source
This commit is contained in:
Roman Zaynetdinov 2016-12-25 18:55:06 +02:00
parent 93e3c3f424
commit 40fa021fc1
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/textdecoder.rs
View file

@ -4,7 +4,6 @@
use dom::bindings::codegen::Bindings::TextDecoderBinding; use dom::bindings::codegen::Bindings::TextDecoderBinding;
use dom::bindings::codegen::Bindings::TextDecoderBinding::TextDecoderMethods; use dom::bindings::codegen::Bindings::TextDecoderBinding::TextDecoderMethods;
use dom::bindings::conversions::array_buffer_view_data;
use dom::bindings::error::{Error, Fallible}; use dom::bindings::error::{Error, Fallible};
use dom::bindings::js::Root; use dom::bindings::js::Root;
use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::reflector::{Reflector, reflect_dom_object};
@ -85,9 +84,10 @@ impl TextDecoderMethods for TextDecoder {
None => return Ok(USVString("".to_owned())), None => return Ok(USVString("".to_owned())),
}; };
let data = match array_buffer_view_data::<u8>(input) { typedarray!(in(_cx) let data_res: ArrayBufferView = input);
Some(data) => data, let mut data = match data_res {
None => { Ok(data) => data,
Err(_) => {
return Err(Error::Type("Argument to TextDecoder.decode is not an ArrayBufferView".to_owned())); return Err(Error::Type("Argument to TextDecoder.decode is not an ArrayBufferView".to_owned()));
} }
}; };
@ -98,7 +98,7 @@ impl TextDecoderMethods for TextDecoder {
DecoderTrap::Replace DecoderTrap::Replace
}; };
match self.encoding.decode(data, trap) { match self.encoding.decode(data.as_slice(), trap) {
Ok(s) => Ok(USVString(s)), Ok(s) => Ok(USVString(s)),
Err(_) => Err(Error::Type("Decoding failed".to_owned())), Err(_) => Err(Error::Type("Decoding failed".to_owned())),
} }