mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Rename MutNullableJS<T> to MutNullableDom<T>
This commit is contained in:
parent
d29335040d
commit
c52fd0a780
63 changed files with 232 additions and 232 deletions
|
@ -6,7 +6,7 @@ use canvas_traits::webgl::{webgl_channel, WebGLCommand, WebGLError};
|
|||
use dom::bindings::codegen::Bindings::OESVertexArrayObjectBinding::{self, OESVertexArrayObjectMethods};
|
||||
use dom::bindings::codegen::Bindings::OESVertexArrayObjectBinding::OESVertexArrayObjectConstants;
|
||||
use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
|
||||
use dom::bindings::root::{Dom, MutNullableJS, Root};
|
||||
use dom::bindings::root::{Dom, MutNullableDom, Root};
|
||||
use dom::webglrenderingcontext::WebGLRenderingContext;
|
||||
use dom::webglvertexarrayobjectoes::WebGLVertexArrayObjectOES;
|
||||
use dom_struct::dom_struct;
|
||||
|
@ -20,7 +20,7 @@ use super::{WebGLExtension, WebGLExtensions};
|
|||
pub struct OESVertexArrayObject {
|
||||
reflector_: Reflector,
|
||||
ctx: Dom<WebGLRenderingContext>,
|
||||
bound_vao: MutNullableJS<WebGLVertexArrayObjectOES>,
|
||||
bound_vao: MutNullableDom<WebGLVertexArrayObjectOES>,
|
||||
}
|
||||
|
||||
impl OESVertexArrayObject {
|
||||
|
@ -28,7 +28,7 @@ impl OESVertexArrayObject {
|
|||
Self {
|
||||
reflector_: Reflector::new(),
|
||||
ctx: Dom::from_ref(ctx),
|
||||
bound_vao: MutNullableJS::new(None)
|
||||
bound_vao: MutNullableDom::new(None)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ use core::iter::FromIterator;
|
|||
use dom::bindings::cell::DOMRefCell;
|
||||
use dom::bindings::codegen::Bindings::WebGLVertexArrayObjectOESBinding;
|
||||
use dom::bindings::reflector::reflect_dom_object;
|
||||
use dom::bindings::root::{Dom, MutNullableJS, Root};
|
||||
use dom::bindings::root::{Dom, MutNullableDom, Root};
|
||||
use dom::globalscope::GlobalScope;
|
||||
use dom::webglbuffer::WebGLBuffer;
|
||||
use dom::webglobject::WebGLObject;
|
||||
|
@ -23,7 +23,7 @@ pub struct WebGLVertexArrayObjectOES {
|
|||
ever_bound: Cell<bool>,
|
||||
is_deleted: Cell<bool>,
|
||||
bound_attrib_buffers: DOMRefCell<HashMap<u32, Dom<WebGLBuffer>>>,
|
||||
bound_buffer_element_array: MutNullableJS<WebGLBuffer>,
|
||||
bound_buffer_element_array: MutNullableDom<WebGLBuffer>,
|
||||
}
|
||||
|
||||
impl WebGLVertexArrayObjectOES {
|
||||
|
@ -34,7 +34,7 @@ impl WebGLVertexArrayObjectOES {
|
|||
ever_bound: Cell::new(false),
|
||||
is_deleted: Cell::new(false),
|
||||
bound_attrib_buffers: DOMRefCell::new(HashMap::new()),
|
||||
bound_buffer_element_array: MutNullableJS::new(None),
|
||||
bound_buffer_element_array: MutNullableDom::new(None),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
use core::nonzero::NonZero;
|
||||
use dom::bindings::reflector::DomObject;
|
||||
use dom::bindings::root::{MutNullableJS, Root};
|
||||
use dom::bindings::root::{MutNullableDom, Root};
|
||||
use dom::bindings::trace::JSTraceable;
|
||||
use dom::webglrenderingcontext::WebGLRenderingContext;
|
||||
use heapsize::HeapSizeOf;
|
||||
|
@ -29,15 +29,15 @@ pub trait WebGLExtensionWrapper: JSTraceable + HeapSizeOf {
|
|||
#[must_root]
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
pub struct TypedWebGLExtensionWrapper<T: WebGLExtension> {
|
||||
extension: MutNullableJS<T::Extension>
|
||||
extension: MutNullableDom<T::Extension>
|
||||
}
|
||||
|
||||
/// Typed WebGL Extension implementation.
|
||||
/// Exposes the exact MutNullableJS<DOMObject> type defined by the extension.
|
||||
/// Exposes the exact MutNullableDom<DOMObject> type defined by the extension.
|
||||
impl<T: WebGLExtension> TypedWebGLExtensionWrapper<T> {
|
||||
pub fn new() -> TypedWebGLExtensionWrapper<T> {
|
||||
TypedWebGLExtensionWrapper {
|
||||
extension: MutNullableJS::new(None)
|
||||
extension: MutNullableDom::new(None)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue