mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
Auto merge of #8212 - Ms2ger:reflow-root, r=pcwalton
Remove SharedLayoutContext::reflow_root. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8212) <!-- Reviewable:end -->
This commit is contained in:
commit
b6bcccb204
6 changed files with 47 additions and 45 deletions
|
@ -441,7 +441,6 @@ impl LayoutTask {
|
|||
fn build_shared_layout_context(&self,
|
||||
rw_data: &LayoutTaskData,
|
||||
screen_size_changed: bool,
|
||||
reflow_root: Option<&LayoutNode>,
|
||||
url: &Url,
|
||||
goal: ReflowGoal)
|
||||
-> SharedLayoutContext {
|
||||
|
@ -456,7 +455,6 @@ impl LayoutTask {
|
|||
canvas_layers_sender: self.canvas_layers_sender.clone(),
|
||||
stylist: &*rw_data.stylist,
|
||||
url: (*url).clone(),
|
||||
reflow_root: reflow_root.map(|node| node.opaque()),
|
||||
visible_rects: rw_data.visible_rects.clone(),
|
||||
generation: rw_data.generation,
|
||||
new_animations_sender: rw_data.new_animations_sender.clone(),
|
||||
|
@ -557,7 +555,6 @@ impl LayoutTask {
|
|||
|
||||
let mut layout_context = self.build_shared_layout_context(&*rw_data,
|
||||
false,
|
||||
None,
|
||||
&self.url,
|
||||
reflow_info.goal);
|
||||
|
||||
|
@ -1210,7 +1207,6 @@ impl LayoutTask {
|
|||
// Create a layout context for use throughout the following passes.
|
||||
let mut shared_layout_context = self.build_shared_layout_context(&*rw_data,
|
||||
screen_size_changed,
|
||||
Some(&node),
|
||||
&self.url,
|
||||
data.reflow_info.goal);
|
||||
|
||||
|
@ -1319,7 +1315,6 @@ impl LayoutTask {
|
|||
|
||||
let mut layout_context = self.build_shared_layout_context(&*rw_data,
|
||||
false,
|
||||
None,
|
||||
&self.url,
|
||||
reflow_info.goal);
|
||||
|
||||
|
@ -1342,7 +1337,6 @@ impl LayoutTask {
|
|||
|
||||
let mut layout_context = self.build_shared_layout_context(&*rw_data,
|
||||
false,
|
||||
None,
|
||||
&self.url,
|
||||
reflow_info.goal);
|
||||
|
||||
|
@ -1376,7 +1370,6 @@ impl LayoutTask {
|
|||
|
||||
let mut layout_context = self.build_shared_layout_context(&*rw_data,
|
||||
false,
|
||||
None,
|
||||
&self.url,
|
||||
reflow_info.goal);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue