> 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
163 lines
5.0 KiB
Rust
163 lines
5.0 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::InheritTypes::FileDerived;
|
|
use dom::bindings::global::{GlobalRef, GlobalField};
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::codegen::Bindings::BlobBinding;
|
|
use dom::bindings::codegen::Bindings::BlobBinding::BlobMethods;
|
|
|
|
use util::str::DOMString;
|
|
|
|
use num::ToPrimitive;
|
|
use std::ascii::AsciiExt;
|
|
use std::borrow::ToOwned;
|
|
use std::cmp::{min, max};
|
|
|
|
#[jstraceable]
|
|
pub enum BlobTypeId {
|
|
Blob,
|
|
File,
|
|
}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#blob
|
|
#[dom_struct]
|
|
pub struct Blob {
|
|
reflector_: Reflector,
|
|
type_: BlobTypeId,
|
|
bytes: Option<Vec<u8>>,
|
|
typeString: DOMString,
|
|
global: GlobalField
|
|
// isClosed_: bool
|
|
}
|
|
|
|
fn is_ascii_printable(string: &DOMString) -> bool{
|
|
// Step 5.1 in Sec 5.1 of File API spec
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
|
|
return string.chars().all(|c| { c >= '\x20' && c <= '\x7E' })
|
|
}
|
|
|
|
impl Blob {
|
|
pub fn new_inherited(global: GlobalRef, type_: BlobTypeId,
|
|
bytes: Option<Vec<u8>>, typeString: &str) -> Blob {
|
|
Blob {
|
|
reflector_: Reflector::new(),
|
|
type_: type_,
|
|
bytes: bytes,
|
|
typeString: typeString.to_owned(),
|
|
global: GlobalField::from_rooted(&global)
|
|
//isClosed_: false
|
|
}
|
|
}
|
|
|
|
pub fn new(global: GlobalRef, bytes: Option<Vec<u8>>,
|
|
typeString: &str) -> Root<Blob> {
|
|
reflect_dom_object(box Blob::new_inherited(global, BlobTypeId::Blob, bytes, typeString),
|
|
global,
|
|
BlobBinding::Wrap)
|
|
}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
|
|
pub fn Constructor(global: GlobalRef) -> Fallible<Root<Blob>> {
|
|
Ok(Blob::new(global, None, ""))
|
|
}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
|
|
pub fn Constructor_(global: GlobalRef, blobParts: DOMString,
|
|
blobPropertyBag: &BlobBinding::BlobPropertyBag) -> Fallible<Root<Blob>> {
|
|
//TODO: accept other blobParts types - ArrayBuffer or ArrayBufferView or Blob
|
|
let bytes: Option<Vec<u8>> = Some(blobParts.into_bytes());
|
|
let typeString = if is_ascii_printable(&blobPropertyBag.type_) {
|
|
&*blobPropertyBag.type_
|
|
} else {
|
|
""
|
|
};
|
|
Ok(Blob::new(global, bytes, &typeString.to_ascii_lowercase()))
|
|
}
|
|
}
|
|
|
|
impl<'a> BlobMethods for &'a Blob {
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#dfn-size
|
|
fn Size(self) -> u64{
|
|
match self.bytes {
|
|
None => 0,
|
|
Some(ref bytes) => bytes.len() as u64
|
|
}
|
|
}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#dfn-type
|
|
fn Type(self) -> DOMString {
|
|
self.typeString.clone()
|
|
}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#slice-method-algo
|
|
fn Slice(self, start: Option<i64>, end: Option<i64>,
|
|
contentType: Option<DOMString>) -> Root<Blob> {
|
|
let size: i64 = self.Size().to_i64().unwrap();
|
|
let relativeStart: i64 = match start {
|
|
None => 0,
|
|
Some(start) => {
|
|
if start < 0 {
|
|
max(size.to_i64().unwrap() + start, 0)
|
|
} else {
|
|
min(start, size)
|
|
}
|
|
}
|
|
};
|
|
let relativeEnd: i64 = match end {
|
|
None => size,
|
|
Some(end) => {
|
|
if end < 0 {
|
|
max(size + end, 0)
|
|
} else {
|
|
min(end, size)
|
|
}
|
|
}
|
|
};
|
|
let relativeContentType = match contentType {
|
|
None => "".to_owned(),
|
|
Some(str) => {
|
|
if is_ascii_printable(&str) {
|
|
str.to_ascii_lowercase()
|
|
} else {
|
|
"".to_owned()
|
|
}
|
|
}
|
|
};
|
|
let span: i64 = max(relativeEnd - relativeStart, 0);
|
|
let global = self.global.root();
|
|
match self.bytes {
|
|
None => Blob::new(global.r(), None, &relativeContentType),
|
|
Some(ref vec) => {
|
|
let start = relativeStart.to_usize().unwrap();
|
|
let end = (relativeStart + span).to_usize().unwrap();
|
|
let mut bytes: Vec<u8> = Vec::new();
|
|
bytes.push_all(&vec[start..end]);
|
|
Blob::new(global.r(), Some(bytes), &relativeContentType)
|
|
}
|
|
}
|
|
}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#dfn-isClosed
|
|
//fn IsClosed(self) -> bool {
|
|
// self.isClosed_.clone()
|
|
//}
|
|
|
|
// http://dev.w3.org/2006/webapi/FileAPI/#dfn-close
|
|
//fn Close(self) {
|
|
// TODO
|
|
//}
|
|
}
|
|
|
|
impl FileDerived for Blob {
|
|
fn is_file(&self) -> bool {
|
|
match self.type_ {
|
|
BlobTypeId::File => true,
|
|
_ => false
|
|
}
|
|
}
|
|
}
|