forked from mirrors/gecko-dev
7512d04e93
> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
91 lines
3.1 KiB
Rust
91 lines
3.1 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::TextEncoderBinding;
|
|
use dom::bindings::codegen::Bindings::TextEncoderBinding::TextEncoderMethods;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::error::Error::Range;
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::str::USVString;
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
|
|
use util::str::DOMString;
|
|
|
|
use std::borrow::ToOwned;
|
|
use std::ptr;
|
|
|
|
use encoding::types::EncodingRef;
|
|
use encoding::{Encoding, EncoderTrap};
|
|
use encoding::label::encoding_from_whatwg_label;
|
|
|
|
use libc::uint8_t;
|
|
use js::jsapi::{JSContext, JSObject};
|
|
use js::jsapi::{JS_NewUint8Array, JS_GetUint8ArrayData};
|
|
|
|
#[dom_struct]
|
|
pub struct TextEncoder {
|
|
reflector_: Reflector,
|
|
encoding: DOMString,
|
|
encoder: EncodingRef,
|
|
}
|
|
|
|
impl TextEncoder {
|
|
fn new_inherited(encoding: DOMString, encoder: EncodingRef) -> TextEncoder {
|
|
TextEncoder {
|
|
reflector_: Reflector::new(),
|
|
encoding: encoding,
|
|
encoder: encoder,
|
|
}
|
|
}
|
|
|
|
pub fn new(global: GlobalRef, encoding: DOMString, encoder: EncodingRef) -> Root<TextEncoder> {
|
|
reflect_dom_object(box TextEncoder::new_inherited(encoding, encoder),
|
|
global,
|
|
TextEncoderBinding::Wrap)
|
|
}
|
|
|
|
// https://encoding.spec.whatwg.org/#dom-textencoder
|
|
pub fn Constructor(global: GlobalRef,
|
|
label: DOMString) -> Fallible<Root<TextEncoder>> {
|
|
let encoding = match encoding_from_whatwg_label(&label) {
|
|
Some(enc) => enc,
|
|
None => {
|
|
debug!("Encoding Label Not Supported");
|
|
return Err(Range("The given encoding is not supported.".to_owned()))
|
|
}
|
|
};
|
|
|
|
match encoding.name() {
|
|
"utf-8" | "utf-16be" | "utf-16le" => {
|
|
Ok(TextEncoder::new(global, encoding.name().to_owned(), encoding))
|
|
}
|
|
_ => {
|
|
debug!("Encoding Not UTF");
|
|
return Err(Range("The encoding must be utf-8, utf-16le, or utf-16be.".to_owned()))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'a> TextEncoderMethods for &'a TextEncoder {
|
|
// https://encoding.spec.whatwg.org/#dom-textencoder-encoding
|
|
fn Encoding(self) -> DOMString {
|
|
self.encoding.clone()
|
|
}
|
|
|
|
// https://encoding.spec.whatwg.org/#dom-textencoder-encode
|
|
#[allow(unsafe_code)]
|
|
fn Encode(self, cx: *mut JSContext, input: USVString) -> *mut JSObject {
|
|
unsafe {
|
|
let encoded = self.encoder.encode(&input.0, EncoderTrap::Strict).unwrap();
|
|
let length = encoded.len() as u32;
|
|
let js_object: *mut JSObject = JS_NewUint8Array(cx, length);
|
|
|
|
let js_object_data: *mut uint8_t = JS_GetUint8ArrayData(js_object, ptr::null());
|
|
ptr::copy_nonoverlapping(encoded.as_ptr(), js_object_data, length as usize);
|
|
return js_object;
|
|
}
|
|
}
|
|
}
|