Make prepare_for_composite return void

components/compositing/compositor.rs

@@ -48,7 +48,6 @@ use webvr_traits::WebVRMainThreadHeartbeat;
 
 #[derive(Debug, PartialEq)]
 enum UnableToComposite {
-    WindowUnprepared,
     NotReadyToPaintImage(NotReadyToPaint),
 }
 
@@ -1212,10 +1211,8 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
             .framebuffer
             .to_u32()
             .height_typed();
-        if !self.window.prepare_for_composite() {
-            return Err(UnableToComposite::WindowUnprepared);
-        }
 
+        self.window.prepare_for_composite();
         self.webrender.update();
 
         let wait_for_stable_image = match target {

components/compositing/windowing.rs

@@ -142,9 +142,8 @@ pub trait WindowMethods {
     /// Presents the window to the screen (perhaps by page flipping).
     fn present(&self);
     /// Requests that the window system prepare a composite. Typically this will involve making
-    /// some type of platform-specific graphics context current. Returns true if the composite may
+    /// some type of platform-specific graphics context current.
-    /// proceed and false if it should not.
+    fn prepare_for_composite(&self);
-    fn prepare_for_composite(&self) -> bool;
     /// Return the GL function pointer trait.
     #[cfg(feature = "gl")]
     fn gl(&self) -> Rc<dyn gl::Gl>;

ports/glutin/headed_window.rs

@@ -510,9 +510,8 @@ impl WindowMethods for Window {
         self.animation_state.set(state);
     }
 
-    fn prepare_for_composite(&self) -> bool {
+    fn prepare_for_composite(&self) {
         self.gl_context.borrow_mut().make_current();
-        true
     }
 }
 

ports/glutin/headless_window.rs

@@ -194,7 +194,5 @@ impl WindowMethods for Window {
         self.animation_state.set(state);
     }
 
-    fn prepare_for_composite(&self) -> bool {
+    fn prepare_for_composite(&self) { }
-        true
-    }
 }

ports/libsimpleservo/api/src/lib.rs

@@ -580,10 +580,9 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
 }
 
 impl WindowMethods for ServoWindowCallbacks {
-    fn prepare_for_composite(&self) -> bool {
+    fn prepare_for_composite(&self) {
         debug!("WindowMethods::prepare_for_composite");
         self.host_callbacks.make_current();
-        true
     }
 
     fn present(&self) {