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

Remove the reflow root from SharedLayoutContext.

Browse source
This commit is contained in:
Ms2ger 2015-07-09 13:12:12 +02:00 • committed by Ms2ger
parent 9f91984415
commit c693e13a2c
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/context.rs
View file

@ -102,9 +102,6 @@ pub struct SharedLayoutContext {
/// FIXME(#2604): Make this no longer an unsafe pointer once we have fast `RWArc`s. /// FIXME(#2604): Make this no longer an unsafe pointer once we have fast `RWArc`s.
pub stylist: *const Stylist, pub stylist: *const Stylist,
/// The root node at which we're starting the layout.
pub reflow_root: Option<OpaqueNode>,
/// The URL. /// The URL.
pub url: Url, pub url: Url,

7
components/layout/layout_task.rs
View file

@ -441,7 +441,6 @@ impl LayoutTask {
fn build_shared_layout_context(&self, fn build_shared_layout_context(&self,
rw_data: &LayoutTaskData, rw_data: &LayoutTaskData,
screen_size_changed: bool, screen_size_changed: bool,
reflow_root: Option<&LayoutNode>,
url: &Url, url: &Url,
goal: ReflowGoal) goal: ReflowGoal)
-> SharedLayoutContext { -> SharedLayoutContext {
@ -456,7 +455,6 @@ impl LayoutTask {
canvas_layers_sender: self.canvas_layers_sender.clone(), canvas_layers_sender: self.canvas_layers_sender.clone(),
stylist: &*rw_data.stylist, stylist: &*rw_data.stylist,
url: (*url).clone(), url: (*url).clone(),
reflow_root: reflow_root.map(|node| node.opaque()),
visible_rects: rw_data.visible_rects.clone(), visible_rects: rw_data.visible_rects.clone(),
generation: rw_data.generation, generation: rw_data.generation,
new_animations_sender: rw_data.new_animations_sender.clone(), 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, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
None,
&self.url, &self.url,
reflow_info.goal); reflow_info.goal);
@ -1188,7 +1185,6 @@ impl LayoutTask {
// Create a layout context for use throughout the following passes. // Create a layout context for use throughout the following passes.
let mut shared_layout_context = self.build_shared_layout_context(&*rw_data, let mut shared_layout_context = self.build_shared_layout_context(&*rw_data,
screen_size_changed, screen_size_changed,
Some(&node),
&self.url, &self.url,
data.reflow_info.goal); data.reflow_info.goal);
@ -1300,7 +1296,6 @@ impl LayoutTask {
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
None,
&self.url, &self.url,
reflow_info.goal); reflow_info.goal);
@ -1323,7 +1318,6 @@ impl LayoutTask {
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
None,
&self.url, &self.url,
reflow_info.goal); reflow_info.goal);
@ -1357,7 +1351,6 @@ impl LayoutTask {
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
None,
&self.url, &self.url,
reflow_info.goal); reflow_info.goal);