aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2016-05-03 18:37:49 -0700
committerPatrick Walton <pcwalton@mimiga.net>2016-05-04 11:40:15 -0700
commit91907f563b72e59ec783fa107ed0468345a58e29 (patch)
tree7de8028218b2985656f5e4cb0de44b7c41acfd44 /components/script/dom/webglrenderingcontext.rs
parentb4f573db1a4a054f7f991ac19c299a5a10aabad8 (diff)
downloadservo-91907f563b72e59ec783fa107ed0468345a58e29.tar.gz
servo-91907f563b72e59ec783fa107ed0468345a58e29.zip
compositing: Send mouse events to the right pipeline when using
WebRender. Fixes mouse events in browser.html. Requires servo/webrender_traits#47 and servo/webrender#272.
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 7e48ba60d34..36a8a4bb3b2 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -472,6 +472,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
WebGLParameter::Bool(_) => panic!("Buffer parameter should not be bool"),
WebGLParameter::Float(_) => panic!("Buffer parameter should not be float"),
WebGLParameter::String(_) => panic!("Buffer parameter should not be string"),
+ WebGLParameter::FloatArray(_) => panic!("Buffer parameter should not be float array"),
WebGLParameter::Invalid => NullValue(),
}
}
@@ -487,6 +488,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
WebGLParameter::Int(val) => Int32Value(val),
WebGLParameter::Bool(val) => BooleanValue(val),
WebGLParameter::Float(val) => DoubleValue(val as f64),
+ WebGLParameter::FloatArray(_) => panic!("Parameter should not be float array"),
WebGLParameter::String(val) => {
let mut rval = RootedValue::new(cx, UndefinedValue());
unsafe {
@@ -1093,6 +1095,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
WebGLParameter::Bool(val) => BooleanValue(val),
WebGLParameter::String(_) => panic!("Program parameter should not be string"),
WebGLParameter::Float(_) => panic!("Program parameter should not be float"),
+ WebGLParameter::FloatArray(_) => {
+ panic!("Program paramenter should not be float array")
+ }
WebGLParameter::Invalid => NullValue(),
}
} else {
@@ -1113,6 +1118,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
WebGLParameter::Bool(val) => BooleanValue(val),
WebGLParameter::String(_) => panic!("Shader parameter should not be string"),
WebGLParameter::Float(_) => panic!("Shader parameter should not be float"),
+ WebGLParameter::FloatArray(_) => {
+ panic!("Shader paramenter should not be float array")
+ }
WebGLParameter::Invalid => NullValue(),
}
} else {