From 3c0c10454bb79bfd0617e37373ee7b6afd3259ad Mon Sep 17 00:00:00 2001
From: oneturkmen <17970732+oneturkmen@users.noreply.github.com>
Date: Wed, 5 Jun 2019 00:35:14 -0600
Subject: [PATCH] Make prepare_for_composite return void

---
 components/compositing/compositor.rs | 5 +----
 components/compositing/windowing.rs  | 5 ++---
 ports/glutin/headed_window.rs        | 3 +--
 ports/glutin/headless_window.rs      | 4 +---
 ports/libsimpleservo/api/src/lib.rs  | 3 +--
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 7560fcf5c22f..7d8bf020e5bc 100644
--- a/components/compositing/compositor.rs
+++ b/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 {
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
index fa9f8c481fbc..28e1cf1f6eb7 100644
--- a/components/compositing/windowing.rs
+++ b/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
-    /// proceed and false if it should not.
-    fn prepare_for_composite(&self) -> bool;
+    /// some type of platform-specific graphics context current.
+    fn prepare_for_composite(&self);
     /// Return the GL function pointer trait.
     #[cfg(feature = "gl")]
     fn gl(&self) -> Rc<dyn gl::Gl>;
diff --git a/ports/glutin/headed_window.rs b/ports/glutin/headed_window.rs
index e2fa3f79c6b8..5a07adf90938 100644
--- a/ports/glutin/headed_window.rs
+++ b/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
     }
 }
 
diff --git a/ports/glutin/headless_window.rs b/ports/glutin/headless_window.rs
index c14228048b75..6357ad04a9c2 100644
--- a/ports/glutin/headless_window.rs
+++ b/ports/glutin/headless_window.rs
@@ -194,7 +194,5 @@ impl WindowMethods for Window {
         self.animation_state.set(state);
     }
 
-    fn prepare_for_composite(&self) -> bool {
-        true
-    }
+    fn prepare_for_composite(&self) { }
 }
diff --git a/ports/libsimpleservo/api/src/lib.rs b/ports/libsimpleservo/api/src/lib.rs
index baafef8aa630..7f0672a4f4a6 100644
--- a/ports/libsimpleservo/api/src/lib.rs
+++ b/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) {