diff options
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 14 | ||||
| -rw-r--r-- | components/script/dom/websocket.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/workerglobalscope.rs | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 0b6fa7b3869..4acf36256c8 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -514,15 +514,13 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 fn VertexAttribPointer(self, attrib_id: u32, size: i32, data_type: u32, normalized: bool, stride: i32, offset: i64) { - match data_type { - constants::FLOAT => { - let msg = CanvasMsg::WebGL( - CanvasWebGLMsg::VertexAttribPointer2f(attrib_id, size, normalized, stride, offset)); - self.ipc_renderer.send(msg).unwrap() - } - _ => panic!("VertexAttribPointer: Data Type not supported") + if let constants::FLOAT = data_type { + let msg = CanvasMsg::WebGL( + CanvasWebGLMsg::VertexAttribPointer2f(attrib_id, size, normalized, stride, offset)); + self.ipc_renderer.send(msg).unwrap() + } else { + panic!("VertexAttribPointer: Data Type not supported") } - } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.4 diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 7855c3e453b..1e00a9e507a 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -277,7 +277,7 @@ impl<'a> WebSocketMethods for &'a WebSocket { let mut other_sender = self.sender.borrow_mut(); let my_sender = other_sender.as_mut().unwrap(); let _ = my_sender.lock().unwrap().send_message(Message::Text(data.unwrap().0)); - return Ok(()) + Ok(()) } // https://html.spec.whatwg.org/multipage/#dom-websocket-close diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 70477846627..468de091271 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -143,11 +143,11 @@ impl WorkerGlobalScope { self.runtime.cx() } - pub fn resource_task<'a>(&'a self) -> &'a ResourceTask { + pub fn resource_task(&self) -> &ResourceTask { &self.resource_task } - pub fn get_url<'a>(&'a self) -> &'a Url { + pub fn get_url(&self) -> &Url { &self.worker_url } |