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

Auto merge of #5916 - servo:prepare-rustup, r=jdm

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5916)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-01 14:44:19 -05:00
commit 2f0b805fad
13 changed files with 66 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/table_rowgroup.rs
View file

@ -88,7 +88,7 @@ impl TableRowGroupFlow {
self.collapsed_inline_direction_border_widths_for_table
.extend(collapsed_inline_direction_border_widths_for_table.into_iter().map(|x| *x));
for _ in range(0, self.block_flow.base.children.len()) {
for _ in 0..self.block_flow.base.children.len() {
if let Some(collapsed_block_direction_border_width_for_table) =
collapsed_block_direction_border_widths_for_table.next() {
self.collapsed_block_direction_border_widths_for_table

2
components/layout/table_wrapper.rs
View file

@ -305,7 +305,7 @@ impl Flow for TableWrapperFlow {
self.compute_used_inline_size(layout_context,
containing_block_inline_size,
intermediate_column_inline_sizes.as_slice());
&intermediate_column_inline_sizes);
if let TableLayout::Auto = self.table_layout {
self.calculate_table_column_sizes_for_automatic_layout(