diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-01-22 12:42:05 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-01-22 17:41:25 +0100 |
commit | 52eda6082fd32d3e28f3600858afd8f5bbc918fe (patch) | |
tree | e4318bad96b0c58beec18a2ece26d114b620c8f3 /components/script/dom/webgl_extensions/extensions.rs | |
parent | 897a5b39c5d843cf0920870e8b4a01a84df236fc (diff) | |
download | servo-52eda6082fd32d3e28f3600858afd8f5bbc918fe.tar.gz servo-52eda6082fd32d3e28f3600858afd8f5bbc918fe.zip |
Replace NonNullJSObjectPtr with std::ptr::NonNull<JSObject>
Diffstat (limited to 'components/script/dom/webgl_extensions/extensions.rs')
-rw-r--r-- | components/script/dom/webgl_extensions/extensions.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs index e599df7a25c..3c22817d555 100644 --- a/components/script/dom/webgl_extensions/extensions.rs +++ b/components/script/dom/webgl_extensions/extensions.rs @@ -7,19 +7,20 @@ 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 js::jsapi::JSContext; +use js::jsapi::JSObject; use js::jsval::JSVal; use malloc_size_of::MallocSizeOf; use ref_filter_map::ref_filter_map; use std::cell::Ref; use std::collections::HashMap; use std::iter::FromIterator; +use std::ptr::NonNull; use super::{ext, WebGLExtension, WebGLExtensionSpec}; use super::wrapper::{WebGLExtensionWrapper, TypedWebGLExtensionWrapper}; @@ -127,7 +128,7 @@ impl WebGLExtensions { .collect() } - pub fn get_or_init_extension(&self, name: &str, ctx: &WebGLRenderingContext) -> Option<NonNullJSObjectPtr> { + pub fn get_or_init_extension(&self, name: &str, ctx: &WebGLRenderingContext) -> Option<NonNull<JSObject>> { let name = name.to_uppercase(); self.extensions.borrow().get(&name).and_then(|extension| { if extension.is_supported(self) { |