mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Make prepare_for_composite return void
This commit is contained in:
parent
7903104e6a
commit
3c0c10454b
5 changed files with 6 additions and 14 deletions
|
@ -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 {
|
||||
|
|
|
@ -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>;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue