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

Fixes #4164 Make Constructor and new functions take GlobalRef by value

Browse source
This commit is contained in:
Matt McCoy 2015-01-07 18:42:06 -05:00 • committed by Matt McCoy
parent cf616b90a2
commit 85df7f0d6f
25 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/blob.rs
View file

@ -37,30 +37,30 @@ fn is_ascii_printable(string: &DOMString) -> bool{
}
impl Blob {
pub fn new_inherited(global: &GlobalRef, type_: BlobTypeId,
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.into_string(),
global: GlobalField::from_rooted(global)
global: GlobalField::from_rooted(&global)
//isClosed_: false
}
}
pub fn new(global: &GlobalRef, bytes: Option<Vec<u8>>,
pub fn new(global: GlobalRef, bytes: Option<Vec<u8>>,
typeString: &str) -> Temporary<Blob> {
reflect_dom_object(box Blob::new_inherited(global, BlobTypeId::Blob, bytes, typeString),
*global,
global,
BlobBinding::Wrap)
}
pub fn Constructor(global: &GlobalRef) -> Fallible<Temporary<Blob>> {
pub fn Constructor(global: GlobalRef) -> Fallible<Temporary<Blob>> {
Ok(Blob::new(global, None, ""))
}
pub fn Constructor_(global: &GlobalRef, blobParts: DOMString, blobPropertyBag: &BlobBinding::BlobPropertyBag) -> Fallible<Temporary<Blob>> {
pub fn Constructor_(global: GlobalRef, blobParts: DOMString, blobPropertyBag: &BlobBinding::BlobPropertyBag) -> Fallible<Temporary<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_) {
@ -121,13 +121,13 @@ impl<'a> BlobMethods for JSRef<'a, Blob> {
let span: i64 = max(relativeEnd - relativeStart, 0);
let global = self.global.root();
match self.bytes {
None => Blob::new(&global.r(), None, relativeContentType.as_slice()),
None => Blob::new(global.r(), None, relativeContentType.as_slice()),
Some(ref vec) => {
let start = relativeStart.to_uint().unwrap();
let end = (relativeStart + span).to_uint().unwrap();
let mut bytes: Vec<u8> = Vec::new();
bytes.push_all(vec.slice(start, end));
Blob::new(&global.r(), Some(bytes), relativeContentType.as_slice())
Blob::new(global.r(), Some(bytes), relativeContentType.as_slice())
}
}
}