diff options
| author | Fabrice Desré <fabrice@desre.org> | 2016-04-25 16:28:35 -0700 |
|---|---|---|
| committer | Fabrice Desré <fabrice@desre.org> | 2016-04-25 18:16:42 -0700 |
| commit | aac71015933c15a36dd1ca319159f4a0e5dbbe4c (patch) | |
| tree | b0921817e2fbed6ecef95a95ac59bef054d6c8a5 /components/compositing/compositor_thread.rs | |
| parent | 81f6e70a623a6f11535322ed2ef954eafaf8c70c (diff) | |
| download | servo-aac71015933c15a36dd1ca319159f4a0e5dbbe4c.tar.gz servo-aac71015933c15a36dd1ca319159f4a0e5dbbe4c.zip | |
Don't expect a native_window when using webrender
Diffstat (limited to 'components/compositing/compositor_thread.rs')
| -rw-r--r-- | components/compositing/compositor_thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/compositing/compositor_thread.rs b/components/compositing/compositor_thread.rs index d624e0212a9..1fa17c6d70e 100644 --- a/components/compositing/compositor_thread.rs +++ b/components/compositing/compositor_thread.rs @@ -128,7 +128,7 @@ impl PaintListener for Box<CompositorProxy + 'static + Send> { // just return None in this case, since the paint thread // will exit shortly and never actually be requested // to paint buffers by the compositor. - port.recv().ok() + port.recv().unwrap_or(None) } fn assign_painted_buffers(&mut self, @@ -179,7 +179,7 @@ pub enum Msg { /// Requests the compositor's graphics metadata. Graphics metadata is what the painter needs /// to create surfaces that the compositor can see. On Linux this is the X display; on Mac this /// is the pixel format. - GetNativeDisplay(Sender<NativeDisplay>), + GetNativeDisplay(Sender<Option<NativeDisplay>>), /// Tells the compositor to create or update the layers for a pipeline if necessary /// (i.e. if no layer with that ID exists). |