diff options
Diffstat (limited to 'components/script/dom/webglprogram.rs')
| -rw-r--r-- | components/script/dom/webglprogram.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index 6382897efb3..4b3b39b05cc 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -6,10 +6,10 @@ use canvas_traits::CanvasMsg; use dom::bindings::codegen::Bindings::WebGLProgramBinding; use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; -use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::reflector::{Reflectable, reflect_dom_object}; use dom::bindings::str::DOMString; +use dom::globalscope::GlobalScope; use dom::webglactiveinfo::WebGLActiveInfo; use dom::webglobject::WebGLObject; use dom::webglrenderingcontext::MAX_UNIFORM_AND_ATTRIBUTE_LEN; @@ -48,7 +48,7 @@ impl WebGLProgram { } } - pub fn maybe_new(global: GlobalRef, renderer: IpcSender<CanvasMsg>) + pub fn maybe_new(global: &GlobalScope, renderer: IpcSender<CanvasMsg>) -> Option<Root<WebGLProgram>> { let (sender, receiver) = ipc::channel().unwrap(); renderer.send(CanvasMsg::WebGL(WebGLCommand::CreateProgram(sender))).unwrap(); @@ -57,7 +57,7 @@ impl WebGLProgram { result.map(|program_id| WebGLProgram::new(global, renderer, program_id)) } - pub fn new(global: GlobalRef, + pub fn new(global: &GlobalScope, renderer: IpcSender<CanvasMsg>, id: WebGLProgramId) -> Root<WebGLProgram> { @@ -230,7 +230,7 @@ impl WebGLProgram { .unwrap(); receiver.recv().unwrap().map(|(size, ty, name)| - WebGLActiveInfo::new(self.global().r(), size, ty, DOMString::from(name))) + WebGLActiveInfo::new(self.global().r().as_global_scope(), size, ty, DOMString::from(name))) } /// glGetActiveAttrib @@ -244,7 +244,7 @@ impl WebGLProgram { .unwrap(); receiver.recv().unwrap().map(|(size, ty, name)| - WebGLActiveInfo::new(self.global().r(), size, ty, DOMString::from(name))) + WebGLActiveInfo::new(self.global().r().as_global_scope(), size, ty, DOMString::from(name))) } /// glGetAttribLocation |