Upgrade to SM 39

This commit is contained in:
Michael Wu 2015-04-06 19:27:56 -04:00
parent a256f39796
commit 675267b782
205 changed files with 6546 additions and 5340 deletions

View file

@ -5,15 +5,16 @@
use dom::bindings::codegen::Bindings::ImageDataBinding;
use dom::bindings::codegen::Bindings::ImageDataBinding::ImageDataMethods;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::js::Root;
use dom::bindings::utils::{Reflector, reflect_dom_object};
use euclid::size::Size2D;
use js::jsapi::{JSContext, JSObject};
use js::jsfriendapi::bindgen::{JS_NewUint8ClampedArray, JS_GetUint8ClampedArrayData};
use js::jsapi::{JSContext, JSObject, Heap};
use js::jsapi::{JS_NewUint8ClampedArray, JS_GetUint8ClampedArrayData};
use libc::uint8_t;
use std::vec::Vec;
use std::slice;
use std::ptr;
use std::default::Default;
#[dom_struct]
#[allow(raw_pointer_derive)]
@ -21,58 +22,57 @@ pub struct ImageData {
reflector_: Reflector,
width: u32,
height: u32,
data: *mut JSObject,
data: Heap<*mut JSObject>,
}
impl ImageData {
#[allow(unsafe_code)]
fn new_inherited(width: u32, height: u32, data: Option<Vec<u8>>, global: GlobalRef) -> ImageData {
pub fn new(global: GlobalRef, width: u32, height: u32, data: Option<Vec<u8>>) -> Root<ImageData> {
let mut imagedata = box ImageData {
reflector_: Reflector::new(),
width: width,
height: height,
data: Heap::default(),
};
unsafe {
let cx = global.get_cx();
let js_object: *mut JSObject = JS_NewUint8ClampedArray(cx, width * height * 4);
if let Some(vec) = data {
let js_object_data: *mut uint8_t = JS_GetUint8ClampedArrayData(js_object, cx);
let js_object_data: *mut uint8_t = JS_GetUint8ClampedArrayData(js_object, ptr::null());
ptr::copy_nonoverlapping(vec.as_ptr(), js_object_data, vec.len())
}
ImageData {
reflector_: Reflector::new(),
width: width,
height: height,
data: js_object,
}
(*imagedata).data.set(js_object);
}
}
pub fn new(global: GlobalRef, width: u32, height: u32, data: Option<Vec<u8>>) -> Temporary<ImageData> {
reflect_dom_object(box ImageData::new_inherited(width, height, data, global),
reflect_dom_object(imagedata,
global, ImageDataBinding::Wrap)
}
}
pub trait ImageDataHelpers {
fn get_data_array(self, global: &GlobalRef) -> Vec<u8>;
fn get_size(&self) -> Size2D<i32>;
fn get_size(self) -> Size2D<i32>;
}
impl<'a> ImageDataHelpers for JSRef<'a, ImageData> {
impl<'a> ImageDataHelpers for &'a ImageData {
#[allow(unsafe_code)]
fn get_data_array(self, global: &GlobalRef) -> Vec<u8> {
unsafe {
let cx = global.get_cx();
let data: *const uint8_t = JS_GetUint8ClampedArrayData(self.Data(cx), cx) as *const uint8_t;
let data: *const uint8_t = JS_GetUint8ClampedArrayData(self.Data(cx), ptr::null()) as *const uint8_t;
let len = self.Width() * self.Height() * 4;
slice::from_raw_parts(data, len as usize).to_vec()
}
}
fn get_size(&self) -> Size2D<i32> {
fn get_size(self) -> Size2D<i32> {
Size2D::new(self.Width() as i32, self.Height() as i32)
}
}
impl<'a> ImageDataMethods for JSRef<'a, ImageData> {
impl<'a> ImageDataMethods for &'a ImageData {
// https://html.spec.whatwg.org/multipage/#dom-imagedata-width
fn Width(self) -> u32 {
self.width
@ -85,6 +85,6 @@ impl<'a> ImageDataMethods for JSRef<'a, ImageData> {
// https://html.spec.whatwg.org/multipage/#dom-imagedata-data
fn Data(self, _: *mut JSContext) -> *mut JSObject {
self.data
self.data.get()
}
}