aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglshader.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-11-27 13:29:22 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2016-11-30 23:23:39 +0100
commit8af2327e95fe2f229df27074b868aad56bce2252 (patch)
tree889b7ddc7fd0353990a7194e3e81e3629727b4bd /components/script/dom/webglshader.rs
parent6210bede8b978a353b217f96de3ac120c25ff17c (diff)
downloadservo-8af2327e95fe2f229df27074b868aad56bce2252.tar.gz
servo-8af2327e95fe2f229df27074b868aad56bce2252.zip
Expose WebGL-related interfaces only in Window
Diffstat (limited to 'components/script/dom/webglshader.rs')
-rw-r--r--components/script/dom/webglshader.rs13
1 files changed, 7 insertions, 6 deletions
diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs
index 93da1ca0bc5..d846ac34aa7 100644
--- a/components/script/dom/webglshader.rs
+++ b/components/script/dom/webglshader.rs
@@ -10,8 +10,8 @@ use dom::bindings::codegen::Bindings::WebGLShaderBinding;
use dom::bindings::js::Root;
use dom::bindings::reflector::reflect_dom_object;
use dom::bindings::str::DOMString;
-use dom::globalscope::GlobalScope;
use dom::webglobject::WebGLObject;
+use dom::window::Window;
use ipc_channel::ipc::IpcSender;
use std::cell::Cell;
use std::sync::{ONCE_INIT, Once};
@@ -66,23 +66,24 @@ impl WebGLShader {
}
}
- pub fn maybe_new(global: &GlobalScope,
+ pub fn maybe_new(window: &Window,
renderer: IpcSender<CanvasMsg>,
- shader_type: u32) -> Option<Root<WebGLShader>> {
+ shader_type: u32)
+ -> Option<Root<WebGLShader>> {
let (sender, receiver) = webrender_traits::channel::msg_channel().unwrap();
renderer.send(CanvasMsg::WebGL(WebGLCommand::CreateShader(shader_type, sender))).unwrap();
let result = receiver.recv().unwrap();
- result.map(|shader_id| WebGLShader::new(global, renderer, shader_id, shader_type))
+ result.map(|shader_id| WebGLShader::new(window, renderer, shader_id, shader_type))
}
- pub fn new(global: &GlobalScope,
+ pub fn new(window: &Window,
renderer: IpcSender<CanvasMsg>,
id: WebGLShaderId,
shader_type: u32)
-> Root<WebGLShader> {
reflect_dom_object(box WebGLShader::new_inherited(renderer, id, shader_type),
- global,
+ window,
WebGLShaderBinding::Wrap)
}
}