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

Fix rebase fallout

Browse source
This commit is contained in:
Eric Atkinson 2013-07-10 14:37:09 -07:00
parent a6f6ce926c
commit 7b933ac952
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/main/layout/float_context.rs
View file

@ -250,7 +250,7 @@ impl FloatContextBase{
/// Returns true if the given rect overlaps with any floats. /// Returns true if the given rect overlaps with any floats.
fn collides_with_float(&self, bounds: &Rect<Au>) -> bool { fn collides_with_float(&self, bounds: &Rect<Au>) -> bool {
for self.float_data.each |float| { for self.float_data.iter().advance |float| {
match *float{ match *float{
None => (), None => (),
Some(data) => { Some(data) => {

14
src/components/main/layout/inline.rs
View file

@ -350,7 +350,7 @@ impl LineboxScanner {
} }
self.pending_line.range.extend_by(1); self.pending_line.range.extend_by(1);
self.pending_line.bounds.size.width = self.pending_line.bounds.size.width + box.position().size.width; self.pending_line.bounds.size.width = self.pending_line.bounds.size.width + box.position().size.width;
self.pending_line.available_width -= box.position().size.width; self.pending_line.available_width = self.pending_line.available_width - box.position().size.width;
self.pending_line.bounds.size.height = Au::max(self.pending_line.bounds.size.height, self.pending_line.bounds.size.height = Au::max(self.pending_line.bounds.size.height,
box.position().size.height); box.position().size.height);
self.new_boxes.push(box); self.new_boxes.push(box);
@ -497,7 +497,7 @@ impl InlineFlowData {
self.common.floats_out = scanner.floats_out(); self.common.floats_out = scanner.floats_out();
// Now, go through each line and lay out the boxes inside // Now, go through each line and lay out the boxes inside
for self.lines.eachi |i, line| { for self.lines.iter().advance |line| {
// We need to distribute extra width based on text-align. // We need to distribute extra width based on text-align.
let mut slack_width = line.available_width; let mut slack_width = line.available_width;
if slack_width < Au(0) { if slack_width < Au(0) {
@ -526,25 +526,25 @@ impl InlineFlowData {
for line.range.eachi |i| { for line.range.eachi |i| {
do self.boxes[i].with_mut_base |base| { do self.boxes[i].with_mut_base |base| {
base.position.origin.x = offset_x; base.position.origin.x = offset_x;
offset_x += base.position.size.width; offset_x = offset_x + base.position.size.width;
} }
} }
} }
CSSTextAlignCenter => { CSSTextAlignCenter => {
offset_x += slack_width.scale_by(0.5f); offset_x = offset_x + slack_width.scale_by(0.5f);
for line.range.eachi |i| { for line.range.eachi |i| {
do self.boxes[i].with_mut_base |base| { do self.boxes[i].with_mut_base |base| {
base.position.origin.x = offset_x; base.position.origin.x = offset_x;
offset_x += base.position.size.width; offset_x = offset_x + base.position.size.width;
} }
} }
} }
CSSTextAlignRight => { CSSTextAlignRight => {
offset_x += slack_width; offset_x = offset_x + slack_width;
for line.range.eachi |i| { for line.range.eachi |i| {
do self.boxes[i].with_mut_base |base| { do self.boxes[i].with_mut_base |base| {
base.position.origin.x = offset_x; base.position.origin.x = offset_x;
offset_x += base.position.size.width; offset_x = offset_x + base.position.size.width;
} }
} }
} }