Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-16 10:55:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove useless arguments from prepare_for_composite

Browse source
This commit is contained in:
Paul Rouget 2018-10-30 07:51:38 +01:00
parent b19f9d9c5b
commit d6b41ba67d
5 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ports/libsimpleservo/src/api.rs
View file

@ -7,13 +7,12 @@ use servo::{self, gl, webrender_api, BrowserId, Servo};
use servo::compositing::windowing::{AnimationState, EmbedderCoordinates, MouseWindowEvent, WindowEvent, WindowMethods};
use servo::embedder_traits::EmbedderMsg;
use servo::embedder_traits::resources::{self, Resource};
use servo::euclid::{Length, TypedPoint2D, TypedScale, TypedSize2D, TypedVector2D};
use servo::euclid::{TypedPoint2D, TypedScale, TypedSize2D, TypedVector2D};
use servo::msg::constellation_msg::TraversalDirection;
use servo::script_traits::{MouseButton, TouchEventType};
use servo::servo_config::opts;
use servo::servo_config::prefs::{PrefValue, PREFS};
use servo::servo_url::ServoUrl;
use servo::style_traits::DevicePixel;
use std::cell::{Cell, RefCell};
use std::mem;
use std::path::PathBuf;
@ -433,11 +432,7 @@ struct ServoCallbacks {
}
impl WindowMethods for ServoCallbacks {
fn prepare_for_composite(
&self,
_width: Length<u32, DevicePixel>,
_height: Length<u32, DevicePixel>,
) -> bool {
fn prepare_for_composite(&self) -> bool {
debug!("WindowMethods::prepare_for_composite");
self.host_callbacks.make_current();
true

13
ports/servo/glutin_app/window.rs
View file

@ -4,7 +4,7 @@
//! A windowing implementation using winit.
use euclid::{Length, TypedPoint2D, TypedVector2D, TypedScale, TypedSize2D};
use euclid::{TypedPoint2D, TypedVector2D, TypedScale, TypedSize2D};
#[cfg(target_os = "windows")]
use gdi32;
use gleam::gl;
@ -776,11 +776,12 @@ impl WindowMethods for Window {
self.animation_state.set(state);
}
fn prepare_for_composite(
&self,
_width: Length<u32, DevicePixel>,
_height: Length<u32, DevicePixel>,
) -> bool {
fn prepare_for_composite(&self) -> bool {
if let WindowKind::Window(ref window, ..) = self.kind {
if let Err(err) = unsafe { window.context().make_current() } {
warn!("Couldn't make window current: {}", err);
}
};
true
}
}