Auto merge of #7 - servo:fixes, r=asajeffrey

Some fixes None
servo · Jul 8, 2019 · 8be96b3 · 8be96b3
2 parents 39600af + b2aa1a9
commit 8be96b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/webxr-api/lib.rs b/webxr-api/lib.rs
@@ -21,6 +21,7 @@ pub use frame::Frame;
 
 pub use registry::MainThreadRegistry;
 pub use registry::Registry;
+pub use registry::{SessionRequestCallback, SessionSupportCallback};
 
 pub use session::FrameRequestCallback;
 pub use session::HighResTimeStamp;

diff --git a/webxr/glwindow/mod.rs b/webxr/glwindow/mod.rs
@@ -39,14 +39,14 @@ const NEAR: f32 = 0.1;
 const FAR: f32 = 100.0;
 
 pub struct GlWindowDiscovery {
-    gl: Rc<Gl>,
+    gl: Rc<dyn Gl>,
     events_loop_factory: EventsLoopFactory,
     gl_version: GlRequest,
 }
 
 impl GlWindowDiscovery {
     pub fn new(
-        gl: Rc<Gl>,
+        gl: Rc<dyn Gl>,
         events_loop_factory: EventsLoopFactory,
         gl_version: GlRequest,
     ) -> GlWindowDiscovery {
@@ -78,7 +78,7 @@ impl Discovery for GlWindowDiscovery {
 pub struct GlWindowDevice {
     size: PhysicalSize,
     gl_context: WindowedContext<PossiblyCurrent>,
-    gl: Rc<Gl>,
+    gl: Rc<dyn Gl>,
     // This will become used when we support keyboard bindings for the WebXR glwindow
     #[allow(dead_code)]
     events_loop: EventsLoop,
@@ -133,7 +133,7 @@ impl Device for GlWindowDevice {
 
 impl GlWindowDevice {
     fn new(
-        gl: Rc<Gl>,
+        gl: Rc<dyn Gl>,
         gl_version: glutin::GlRequest,
         events_loop: glutin::EventsLoop,
     ) -> Result<GlWindowDevice, Error> {
@@ -177,4 +177,4 @@ impl GlWindowDevice {
     }
 }
 
-pub type EventsLoopFactory = Box<Fn() -> Result<EventsLoop, EventsLoopClosed>>;
+pub type EventsLoopFactory = Box<dyn Fn() -> Result<EventsLoop, EventsLoopClosed>>;