diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-01 14:50:17 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-01 14:50:17 +0530 |
| commit | 601169c0e5b0207805bb316b21e556f5ab67df9b (patch) | |
| tree | c3772d45214d4e14b4992a3d34accce24e00bfbd | |
| parent | 959ae86bd0435bf67626d3203a220c0e9f2eea40 (diff) | |
| parent | aebf87cf5bab8c25bb4793c13dea048de8087512 (diff) | |
| download | servo-601169c0e5b0207805bb316b21e556f5ab67df9b.tar.gz servo-601169c0e5b0207805bb316b21e556f5ab67df9b.zip | |
Auto merge of #8290 - itsmeolivia:store-script-reflow, r=Ms2ger
Un-boxed ScriptReflow
As per #8238 I changed `layout_interface::Msg::Reflow` to store `ScriptReflow` rather than `Box<ScriptReflow>`
I ran the tests and believe everything passed but this is my first commit to the project so sorry if I messed up the protocol!
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8290)
<!-- Reviewable:end -->
| -rw-r--r-- | components/layout/layout_task.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 2 | ||||
| -rw-r--r-- | components/script/layout_interface.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 273d56bca80..06c56110386 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -593,7 +593,7 @@ impl LayoutTask { profile(time::ProfilerCategory::LayoutPerform, self.profiler_metadata(), self.time_profiler_chan.clone(), - || self.handle_reflow(&*data, possibly_locked_rw_data)); + || self.handle_reflow(&data, possibly_locked_rw_data)); }, Msg::TickAnimations => self.tick_all_animations(possibly_locked_rw_data), Msg::ReflowWithNewlyLoadedWebFont => { diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index abe693696fd..c074935938b 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -910,7 +910,7 @@ impl Window { } // Send new document and relevant styles to layout. - let reflow = box ScriptReflow { + let reflow = ScriptReflow { reflow_info: Reflow { goal: goal, page_clip_rect: self.page_clip_rect.get(), diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index 5c41a04363c..acb69a02321 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -47,7 +47,7 @@ pub enum Msg { SetQuirksMode, /// Requests a reflow. - Reflow(Box<ScriptReflow>), + Reflow(ScriptReflow), /// Get an RPC interface. GetRPC(Sender<Box<LayoutRPC + Send>>), |