diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-04 14:55:09 -0700 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-04 14:55:09 -0700 |
| commit | 97dfcedbcfe781dc07661e4cfe886cc8edff7785 (patch) | |
| tree | 105fd22e37e11e8fffb0bbdebe791d4d8e6c761b /components/script/dom/webglrenderingcontext.rs | |
| parent | 35ba29355f40f27b2febe87aad7d7ffba20160c0 (diff) | |
| parent | 91907f563b72e59ec783fa107ed0468345a58e29 (diff) | |
| download | servo-97dfcedbcfe781dc07661e4cfe886cc8edff7785.tar.gz servo-97dfcedbcfe781dc07661e4cfe886cc8edff7785.zip | |
Auto merge of #11000 - pcwalton:wr-pipeline-relative-events, r=glennw
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.
r? @glennw
cc @paulrouget
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11000)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 8 |
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 { |