aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webgl_extensions/extensions.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-10-14 12:54:57 +0200
committerSimon Sapin <simon.sapin@exyr.org>2017-10-16 20:19:56 +0200
commite2fafd2dfc7a1b66fb224c83e15042d8f6d595c0 (patch)
tree51fa54657e9b0dddc4a0e1f6dc660c8943284335 /components/script/dom/webgl_extensions/extensions.rs
parent115d859551323c821beb412d550c6dacbcdd5e23 (diff)
downloadservo-e2fafd2dfc7a1b66fb224c83e15042d8f6d595c0.tar.gz
servo-e2fafd2dfc7a1b66fb224c83e15042d8f6d595c0.zip
Replace NonZero<*mut JSObject> with a wrapper to enable local trait impls.
Diffstat (limited to 'components/script/dom/webgl_extensions/extensions.rs')
-rw-r--r--components/script/dom/webgl_extensions/extensions.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs
index 7cb478f9fb0..0707407401e 100644
--- a/components/script/dom/webgl_extensions/extensions.rs
+++ b/components/script/dom/webgl_extensions/extensions.rs
@@ -4,18 +4,18 @@
use canvas_traits::webgl::WebGLError;
use core::iter::FromIterator;
-use core::nonzero::NonZero;
use dom::bindings::cell::DomRefCell;
use dom::bindings::codegen::Bindings::OESStandardDerivativesBinding::OESStandardDerivativesConstants;
use dom::bindings::codegen::Bindings::OESTextureHalfFloatBinding::OESTextureHalfFloatConstants;
use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
+use dom::bindings::nonnull::NonNullJSObjectPtr;
use dom::bindings::root::DomRoot;
use dom::bindings::trace::JSTraceable;
use dom::webglrenderingcontext::WebGLRenderingContext;
use fnv::{FnvHashMap, FnvHashSet};
use gleam::gl::GLenum;
use heapsize::HeapSizeOf;
-use js::jsapi::{JSContext, JSObject};
+use js::jsapi::JSContext;
use js::jsval::JSVal;
use ref_filter_map::ref_filter_map;
use std::cell::Ref;
@@ -109,7 +109,7 @@ impl WebGLExtensions {
.collect()
}
- pub fn get_or_init_extension(&self, name: &str, ctx: &WebGLRenderingContext) -> Option<NonZero<*mut JSObject>> {
+ pub fn get_or_init_extension(&self, name: &str, ctx: &WebGLRenderingContext) -> Option<NonNullJSObjectPtr> {
let name = name.to_uppercase();
self.extensions.borrow().get(&name).and_then(|extension| {
if extension.is_supported(self) {