diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 03:03:44 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 03:03:44 +0530 |
commit | a0221b91268307b1c2690241a4d24816471c915e (patch) | |
tree | 3de297e866d877d30b117dd2ddaaeba934bd51fb /components/layout/layout_task.rs | |
parent | c54558d5ef0ffbe7892ad1ba0c66bec6b0886fe1 (diff) | |
parent | 631180b3195b3fc7e1de9b596d7d062862a57f49 (diff) | |
download | servo-a0221b91268307b1c2690241a4d24816471c915e.tar.gz servo-a0221b91268307b1c2690241a4d24816471c915e.zip |
Auto merge of #8330 - Ms2ger:rm-screen_size, r=larsbergstrom
Remove unused LayoutTaskData::screen_size.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8330)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/layout_task.rs')
-rw-r--r-- | components/layout/layout_task.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index d4931848f05..ec5bd2c0779 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -109,9 +109,6 @@ pub struct LayoutTaskData { /// The channel on which messages can be sent to the constellation. pub constellation_chan: ConstellationChan, - /// The size of the screen. - pub screen_size: Size2D<Au>, - /// The size of the viewport. This may be different from the size of the screen due to viewport /// constraints. pub viewport_size: Size2D<Au>, @@ -350,7 +347,6 @@ impl LayoutTask { time_profiler_chan: time::ProfilerChan, mem_profiler_chan: mem::ProfilerChan) -> LayoutTask { - let screen_size = Size2D::new(Au(0), Au(0)); let device = Device::new( MediaType::Screen, opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0)); @@ -411,8 +407,7 @@ impl LayoutTask { root_flow: None, image_cache_task: image_cache_task, constellation_chan: constellation_chan, - screen_size: screen_size, - viewport_size: screen_size, + viewport_size: Size2D::new(Au(0), Au(0)), stacking_context: None, stylist: stylist, parallel_traversal: parallel_traversal, @@ -1158,7 +1153,6 @@ impl LayoutTask { let old_viewport_size = rw_data.viewport_size; let current_screen_size = Size2D::new(Au::from_f32_px(initial_viewport.width.get()), Au::from_f32_px(initial_viewport.height.get())); - rw_data.screen_size = current_screen_size; // Calculate the actual viewport as per DEVICE-ADAPT § 6 let device = Device::new(MediaType::Screen, initial_viewport); |