forked from mirrors/gecko-dev
> 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
112 lines
3.7 KiB
Rust
112 lines
3.7 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::TextDecoderBinding;
|
|
use dom::bindings::codegen::Bindings::TextDecoderBinding::TextDecoderMethods;
|
|
use dom::bindings::error::{Error, Fallible};
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::str::USVString;
|
|
use dom::bindings::trace::JSTraceable;
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
|
|
use util::str::DOMString;
|
|
|
|
use encoding::Encoding;
|
|
use encoding::types::{EncodingRef, DecoderTrap};
|
|
use encoding::label::encoding_from_whatwg_label;
|
|
use js::jsapi::{JSContext, JSObject};
|
|
use js::jsapi::JS_GetObjectAsArrayBufferView;
|
|
|
|
use std::borrow::ToOwned;
|
|
use std::ptr;
|
|
use std::slice;
|
|
|
|
#[dom_struct]
|
|
pub struct TextDecoder {
|
|
reflector_: Reflector,
|
|
encoding: EncodingRef,
|
|
fatal: bool,
|
|
}
|
|
|
|
impl TextDecoder {
|
|
fn new_inherited(encoding: EncodingRef, fatal: bool) -> TextDecoder {
|
|
TextDecoder {
|
|
reflector_: Reflector::new(),
|
|
encoding: encoding,
|
|
fatal: fatal,
|
|
}
|
|
}
|
|
|
|
fn make_range_error() -> Fallible<Root<TextDecoder>> {
|
|
Err(Error::Range("The given encoding is not supported.".to_owned()))
|
|
}
|
|
|
|
pub fn new(global: GlobalRef, encoding: EncodingRef, fatal: bool) -> Root<TextDecoder> {
|
|
reflect_dom_object(box TextDecoder::new_inherited(encoding, fatal),
|
|
global,
|
|
TextDecoderBinding::Wrap)
|
|
}
|
|
|
|
/// https://encoding.spec.whatwg.org/#dom-textdecoder
|
|
pub fn Constructor(global: GlobalRef,
|
|
label: DOMString,
|
|
options: &TextDecoderBinding::TextDecoderOptions)
|
|
-> Fallible<Root<TextDecoder>> {
|
|
let encoding = match encoding_from_whatwg_label(&label) {
|
|
None => return TextDecoder::make_range_error(),
|
|
Some(enc) => enc
|
|
};
|
|
// The rust-encoding crate has WHATWG compatibility, so we are
|
|
// guaranteed to have a whatwg_name because we successfully got
|
|
// the encoding from encoding_from_whatwg_label.
|
|
// Use match + panic! instead of unwrap for better error message
|
|
match encoding.whatwg_name() {
|
|
None => panic!("Label {} fits valid encoding without valid name", label),
|
|
Some("replacement") => return TextDecoder::make_range_error(),
|
|
_ => ()
|
|
};
|
|
Ok(TextDecoder::new(global, encoding, options.fatal))
|
|
}
|
|
}
|
|
|
|
|
|
impl<'a> TextDecoderMethods for &'a TextDecoder {
|
|
fn Encoding(self) -> DOMString {
|
|
self.encoding.whatwg_name().unwrap().to_owned()
|
|
}
|
|
|
|
fn Fatal(self) -> bool {
|
|
self.fatal
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
fn Decode(self, _cx: *mut JSContext, input: Option<*mut JSObject>)
|
|
-> Fallible<USVString> {
|
|
let input = match input {
|
|
Some(input) => input,
|
|
None => return Ok(USVString("".to_owned())),
|
|
};
|
|
|
|
let mut length = 0;
|
|
let mut data = ptr::null_mut();
|
|
if unsafe { JS_GetObjectAsArrayBufferView(input, &mut length, &mut data).is_null() } {
|
|
return Err(Error::Type("Argument to TextDecoder.decode is not an ArrayBufferView".to_owned()));
|
|
}
|
|
|
|
let buffer = unsafe {
|
|
slice::from_raw_parts(data as *const _, length as usize)
|
|
};
|
|
let trap = if self.fatal {
|
|
DecoderTrap::Strict
|
|
} else {
|
|
DecoderTrap::Replace
|
|
};
|
|
match self.encoding.decode(buffer, trap) {
|
|
Ok(s) => Ok(USVString(s)),
|
|
Err(_) => Err(Error::Type("Decoding failed".to_owned())),
|
|
}
|
|
}
|
|
|
|
}
|