aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/textencoder.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-05-30 03:50:18 -0500
committerGitHub <noreply@github.com>2017-05-30 03:50:18 -0500
commit25d0c561413a42fd375ea04d891855581fdf5168 (patch)
treeda2f2ffaadad7ff24fb64ff13a36d18fbe017d06 /components/script/dom/textencoder.rs
parent9e89b0a2293596f970b60307fff42f955083ca84 (diff)
parent57438cffeb332b027b2a6c5d9164d0c2cab1bae0 (diff)
downloadservo-25d0c561413a42fd375ea04d891855581fdf5168.tar.gz
servo-25d0c561413a42fd375ea04d891855581fdf5168.zip
Auto merge of #17061 - servo:utf8, r=nox
EventSource: decode UTF-8 code points across network packets <!-- 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/17061) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/textencoder.rs')
-rw-r--r--components/script/dom/textencoder.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs
index 765c95ade0b..5cdbeca1dd3 100644
--- a/components/script/dom/textencoder.rs
+++ b/components/script/dom/textencoder.rs
@@ -11,9 +11,6 @@ use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::str::{DOMString, USVString};
use dom::globalscope::GlobalScope;
use dom_struct::dom_struct;
-use encoding::EncoderTrap;
-use encoding::Encoding;
-use encoding::all::UTF_8;
use js::jsapi::{JSContext, JSObject};
use js::typedarray::{Uint8Array, CreateWith};
use std::ptr;
@@ -45,13 +42,13 @@ impl TextEncoder {
impl TextEncoderMethods for TextEncoder {
// https://encoding.spec.whatwg.org/#dom-textencoder-encoding
fn Encoding(&self) -> DOMString {
- DOMString::from(UTF_8.name())
+ DOMString::from("utf-8")
}
#[allow(unsafe_code)]
// https://encoding.spec.whatwg.org/#dom-textencoder-encode
unsafe fn Encode(&self, cx: *mut JSContext, input: USVString) -> NonZero<*mut JSObject> {
- let encoded = UTF_8.encode(&input.0, EncoderTrap::Strict).unwrap();
+ let encoded = input.0.as_bytes();
rooted!(in(cx) let mut js_object = ptr::null_mut());
assert!(Uint8Array::create(cx, CreateWith::Slice(&encoded), js_object.handle_mut()).is_ok());