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

layout: Remove layout/extra.rs.

Browse source 
Also, rename a few methods in layout that arguably had confusing names.
This commit is contained in:
Patrick Walton 2014-09-17 20:49:51 -07:00
parent 5e5f77a354
commit f5c0124363
8 changed files with 117 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/layout_task.rs
View file

@ -54,9 +54,9 @@ use servo_util::geometry;
use servo_util::logical_geometry::LogicalPoint;
use servo_util::opts::Opts;
use servo_util::smallvec::{SmallVec, SmallVec1};
use servo_util::task::spawn_named_with_send_on_failure;
use servo_util::time::{TimeProfilerChan, profile};
use servo_util::time;
use servo_util::task::spawn_named_with_send_on_failure;
use servo_util::workqueue::WorkQueue;
use std::cell::Cell;
use std::comm::{channel, Sender, Receiver, Select};
@ -629,7 +629,7 @@ impl LayoutTask {
// positioned, it would return a reference to itself in
// `abs_descendants` and would lead to a circular reference.
// Set Root as CB for any remaining absolute descendants.
flow.set_abs_descendants(abs_descendants);
flow.set_absolute_descendants(abs_descendants);
flow
}
_ => fail!("Flow construction didn't result in a flow at the root of the tree!"),
@ -655,11 +655,7 @@ impl LayoutTask {
layout_root.traverse_postorder(&mut traversal);
}
// FIXME(kmc): We want to prune nodes without the Reflow restyle damage
// bit, but FloatContext values can't be reused, so we need to
// recompute them every time.
// NOTE: this currently computes borders, so any pruning should separate that operation
// out.
// FIXME(pcwalton): Prune these two passes.
{
let mut traversal = AssignISizesTraversal {
layout_context: layout_context,
@ -667,7 +663,6 @@ impl LayoutTask {
layout_root.traverse_preorder(&mut traversal);
}
// FIXME(pcwalton): Prune this pass as well.
{
let mut traversal = AssignBSizesAndStoreOverflowTraversal {
layout_context: layout_context,
@ -733,7 +728,6 @@ impl LayoutTask {
};
debug!("layout: received layout request for: {:s}", data.url.serialize());
debug!("layout: damage is {:?}", data.damage);
debug!("layout: parsed Node tree");
debug!("{:?}", node.dump());