aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-02-12 04:55:40 -0800
committerGitHub <noreply@github.com>2017-02-12 04:55:40 -0800
commit89dcbec0ba95eaabb7bf4e5da62a6e7de89feed2 (patch)
tree2377db69a0732d8278235f6ae6a2adb9c3a3609d /components/script/dom
parent45db39cc0406a90273a5a74738fe94943a57b142 (diff)
parent58046cc83c8d5323878b2864b77786e2e2da540e (diff)
downloadservo-89dcbec0ba95eaabb7bf4e5da62a6e7de89feed2.tar.gz
servo-89dcbec0ba95eaabb7bf4e5da62a6e7de89feed2.zip
Auto merge of #15515 - nox:rustc-serialize, r=jdm
Remove rustc-serialize from range <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15515) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/conversions.rs34
1 files changed, 7 insertions, 27 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 3c8aad319d3..747573cec05 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -46,21 +46,19 @@ use js::error::throw_type_error;
use js::glue::{GetProxyPrivate, IsWrapper};
use js::glue::{RUST_JSID_IS_INT, RUST_JSID_TO_INT};
use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_STRING, UnwrapObject};
-use js::jsapi::{HandleId, HandleObject, HandleValue, JSContext};
-use js::jsapi::{JSObject, JSString};
-use js::jsapi::{JS_GetLatin1StringCharsAndLength, JS_GetObjectAsArrayBuffer, JS_GetObjectAsArrayBufferView};
-use js::jsapi::{JS_GetReservedSlot, JS_GetTwoByteStringCharsAndLength};
-use js::jsapi::{JS_IsArrayObject, JS_NewStringCopyN, JS_StringHasLatin1Chars};
-use js::jsapi::{JS_NewFloat32Array, JS_NewFloat64Array};
-use js::jsapi::{JS_NewInt8Array, JS_NewInt16Array, JS_NewInt32Array};
+use js::jsapi::{HandleId, HandleObject, HandleValue, JSContext, JSObject, JSString};
+use js::jsapi::{JS_GetLatin1StringCharsAndLength, JS_GetReservedSlot};
+use js::jsapi::{JS_GetTwoByteStringCharsAndLength, JS_IsArrayObject};
+use js::jsapi::{JS_NewFloat32Array, JS_NewFloat64Array, JS_NewInt8Array};
+use js::jsapi::{JS_NewInt16Array, JS_NewInt32Array, JS_NewStringCopyN};
use js::jsapi::{JS_NewUint8Array, JS_NewUint16Array, JS_NewUint32Array};
-use js::jsapi::{MutableHandleValue, Type};
+use js::jsapi::{JS_StringHasLatin1Chars, MutableHandleValue, Type};
use js::jsval::{ObjectValue, StringValue};
use js::rust::{ToString, get_object_class, is_dom_class, is_dom_object, maybe_wrap_value};
use libc;
use num_traits::Float;
use servo_config::opts;
-use std::{char, mem, ptr, slice};
+use std::{char, ptr, slice};
/// A trait to check whether a given `JSObject` implements an IDL interface.
pub trait IDLInterface {
@@ -554,24 +552,6 @@ unsafe impl ArrayBufferViewContents for f64 {
}
}
-/// Returns a mutable slice of the Array Buffer View data, viewed as T, without
-/// checking the real type of it.
-pub unsafe fn array_buffer_view_data<'a, T>(abv: *mut JSObject) -> Option<&'a mut [T]>
- where T: ArrayBufferViewContents
-{
- assert!(!abv.is_null());
-
- let mut byte_length = 0;
- let mut ptr = ptr::null_mut();
- let mut is_shared = false;
- let ret = JS_GetObjectAsArrayBufferView(abv, &mut byte_length, &mut is_shared, &mut ptr);
- assert!(!is_shared);
- if ret.is_null() {
- return None;
- }
- Some(slice::from_raw_parts_mut(ptr as *mut T, byte_length as usize / mem::size_of::<T>()))
-}
-
/// Returns whether `value` is an array-like object.
/// Note: Currently only Arrays are supported.
/// TODO: Expand this to support sequences and other array-like objects