aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorSam Liu <sam@ambushnetworks.com>2017-02-20 19:26:23 -0800
committerSam Liu <sam@ambushnetworks.com>2017-02-20 23:13:47 -0800
commit4fc3e7e75d7eb7e61d4cbefd82d520a7d7320ef8 (patch)
treeb5bc1674e21a7cba492bc7f5d157f1a5ca2c8741 /components/script/dom/webglrenderingcontext.rs
parentccc1df2dfe4f823419f57018c61cf53304979d11 (diff)
downloadservo-4fc3e7e75d7eb7e61d4cbefd82d520a7d7320ef8.tar.gz
servo-4fc3e7e75d7eb7e61d4cbefd82d520a7d7320ef8.zip
Replace uses of spidermonkey-specific JS_GetArrayBufferViewType with ArrayBufferView impl's method get_array_type()
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 6c9aa68db9b..7844b53aac3 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -37,7 +37,7 @@ use dom::window::Window;
use euclid::size::Size2D;
use ipc_channel::ipc::{self, IpcSender};
use js::conversions::ConversionBehavior;
-use js::jsapi::{JSContext, JSObject, JS_GetArrayBufferViewType, Type, Rooted};
+use js::jsapi::{JSContext, JSObject, Type, Rooted};
use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue, UndefinedValue};
use js::typedarray::{TypedArray, TypedArrayElement, Float32, Int32};
use net_traits::image::base::PixelFormat;
@@ -2080,8 +2080,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
}
typedarray!(in(cx) let mut pixels_data: ArrayBufferView = pixels);
- let mut data = match { pixels_data.as_mut() } {
- Ok(data) => data.as_mut_slice(),
+ let (array_type, mut data) = match { pixels_data.as_mut() } {
+ Ok(data) => (data.get_array_type(), data.as_mut_slice()),
Err(_) => return Err(Error::Type("Not an ArrayBufferView".to_owned())),
};
@@ -2089,7 +2089,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
return Ok(());
}
- match { JS_GetArrayBufferViewType(pixels) } {
+ match array_type {
Type::Uint8 => (),
_ => return Ok(self.webgl_error(InvalidOperation)),
}