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

Initial window sizes are mandatory.

Browse source
This commit is contained in:
Josh Matthews 2018-12-09 14:16:14 -05:00
parent 34e77f62af
commit 231a37be24
12 changed files with 101 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/constellation/pipeline.rs
View file

@ -152,7 +152,7 @@ pub struct InitialPipelineState {
pub mem_profiler_chan: profile_mem::ProfilerChan,
/// Information about the initial window size.
pub window_size: Option<TypedSize2D<f32, CSSPixel>>,
pub window_size: TypedSize2D<f32, CSSPixel>,
/// Information about the device pixel ratio.
pub device_pixel_ratio: TypedScale<f32, CSSPixel, DevicePixel>,
@ -200,11 +200,10 @@ impl Pipeline {
let (layout_content_process_shutdown_chan, layout_content_process_shutdown_port) =
ipc::channel().expect("Pipeline layout content shutdown chan");
let device_pixel_ratio = state.device_pixel_ratio;
let window_size = state.window_size.map(|size| WindowSizeData {
initial_viewport: size,
device_pixel_ratio: device_pixel_ratio,
});
let window_size = WindowSizeData {
initial_viewport: state.window_size,
device_pixel_ratio: state.device_pixel_ratio,
};
let url = state.load_data.url.clone();
@ -475,7 +474,7 @@ pub struct UnprivilegedPipelineContent {
resource_threads: ResourceThreads,
time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: profile_mem::ProfilerChan,
window_size: Option<WindowSizeData>,
window_size: WindowSizeData,
script_chan: IpcSender<ConstellationControlMsg>,
load_data: LoadData,
script_port: IpcReceiver<ConstellationControlMsg>,