aboutsummaryrefslogtreecommitdiffstats
path: root/components/canvas_traits/webgl_channel/mpsc.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-08-16 09:45:13 -0500
committerGitHub <noreply@github.com>2017-08-16 09:45:13 -0500
commit4d10d39e8fe841c5fe2ac58da2daaa13c10c140e (patch)
treef77d68b734a6327898cc8c01505b0723bf45ed4a /components/canvas_traits/webgl_channel/mpsc.rs
parentee94e2b7c0bd327abe8f9545b2a1f792f67a2bdd (diff)
parentcfe22e3979b7270833a4b450b25fb2157deb1da2 (diff)
downloadservo-4d10d39e8fe841c5fe2ac58da2daaa13c10c140e.tar.gz
servo-4d10d39e8fe841c5fe2ac58da2daaa13c10c140e.zip
Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox
Revert "Auto merge of #17891 - MortimerGoro:webgl_move, r=glennw,emilio" This reverts commit 90f55ea4580e2a15f7d70d0491444f18b972d450, reversing changes made to 2e60b27a2186a8cba4b952960155dfcf3f47d7db. Doing that per Josh's request, since it's causing very frequent intermittent OOMs on the android builders. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18114) <!-- Reviewable:end -->
Diffstat (limited to 'components/canvas_traits/webgl_channel/mpsc.rs')
-rw-r--r--components/canvas_traits/webgl_channel/mpsc.rs51
1 files changed, 0 insertions, 51 deletions
diff --git a/components/canvas_traits/webgl_channel/mpsc.rs b/components/canvas_traits/webgl_channel/mpsc.rs
deleted file mode 100644
index b0fe29241f3..00000000000
--- a/components/canvas_traits/webgl_channel/mpsc.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use serde::{Deserialize, Serialize};
-use serde::{Deserializer, Serializer};
-use std::sync::mpsc;
-
-#[macro_use]
-macro_rules! unreachable_serializable {
- ($name:ident) => {
- impl<T> Serialize for $name<T> {
- fn serialize<S: Serializer>(&self, _: S) -> Result<S::Ok, S::Error> {
- unreachable!();
- }
- }
-
- impl<'a, T> Deserialize<'a> for $name<T> {
- fn deserialize<D>(_: D) -> Result<$name<T>, D::Error>
- where D: Deserializer<'a> {
- unreachable!();
- }
- }
- };
-}
-
-#[derive(Clone)]
-pub struct WebGLSender<T>(mpsc::Sender<T>);
-pub struct WebGLReceiver<T>(mpsc::Receiver<T>);
-
-impl<T> WebGLSender<T> {
- #[inline]
- pub fn send(&self, data: T) -> Result<(), mpsc::SendError<T>> {
- self.0.send(data)
- }
-}
-
-impl<T> WebGLReceiver<T> {
- #[inline]
- pub fn recv(&self) -> Result<T, mpsc::RecvError> {
- self.0.recv()
- }
-}
-
-pub fn webgl_channel<T>() -> Result<(WebGLSender<T>, WebGLReceiver<T>), ()> {
- let (sender, receiver) = mpsc::channel();
- Ok((WebGLSender(sender), WebGLReceiver(receiver)))
-}
-
-unreachable_serializable!(WebGLReceiver);
-unreachable_serializable!(WebGLSender);