From 661e258b28fd7dcc92ab233f66bf49c061542865 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 24 Jul 2018 13:27:33 +0200 Subject: Store a reference to the WebGLRenderingContext in WebGLObject --- components/script/dom/webglobject.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'components/script/dom/webglobject.rs') diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs index 123420b7cb0..7d4dbabc998 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webglobject.rs @@ -4,17 +4,25 @@ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl use dom::bindings::reflector::Reflector; +use dom::bindings::root::Dom; +use dom::webglrenderingcontext::WebGLRenderingContext; use dom_struct::dom_struct; #[dom_struct] pub struct WebGLObject { reflector_: Reflector, + context: Dom, } impl WebGLObject { - pub fn new_inherited() -> WebGLObject { + pub fn new_inherited(context: &WebGLRenderingContext) -> WebGLObject { WebGLObject { reflector_: Reflector::new(), + context: Dom::from_ref(context), } } + + pub fn context(&self) -> &WebGLRenderingContext { + &self.context + } } -- cgit v1.2.3 From 45f7199eee82c66637ec68287eafa40a651001c4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 1 Nov 2018 23:45:06 +0100 Subject: `cargo fix --edition` --- components/script/dom/webglobject.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/webglobject.rs') diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs index 7d4dbabc998..fc4092402bf 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webglobject.rs @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl -use dom::bindings::reflector::Reflector; -use dom::bindings::root::Dom; -use dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::bindings::reflector::Reflector; +use crate::dom::bindings::root::Dom; +use crate::dom::webglrenderingcontext::WebGLRenderingContext; use dom_struct::dom_struct; #[dom_struct] -- cgit v1.2.3 From a1a14459c141afc6ac6771b8a6c9ca374537edf2 Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Mon, 19 Nov 2018 14:47:12 +0100 Subject: Update MPL license to https (part 3) --- components/script/dom/webglobject.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/webglobject.rs') diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs index fc4092402bf..999c7797b10 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webglobject.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl use crate::dom::bindings::reflector::Reflector; -- cgit v1.2.3