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

Pass SharedStyleContext to containing_block_inline_size.

Browse source
This commit is contained in:
Ms2ger 2016-06-20 19:37:32 +02:00
parent f20ea08a1b
commit 2a1e2f491a
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/table_wrapper.rs
View file

@ -30,8 +30,10 @@ use std::fmt;
use std::ops::Add;
use std::sync::Arc;
use style::computed_values::{border_collapse, table_layout};
use style::context::StyleContext;
use style::logical_geometry::LogicalSize;
use style::properties::{ComputedValues, ServoComputedValues};
use style::servo::SharedStyleContext;
use style::values::CSSFloat;
use style::values::computed::LengthOrPercentageOrAuto;
use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize};
@ -772,7 +774,7 @@ impl ISizeAndMarginsComputer for Table {
let containing_block_inline_size =
self.containing_block_inline_size(block,
parent_flow_inline_size,
layout_context);
layout_context.shared_context());
initial_computed_inline_size(block,
containing_block_inline_size,
self.minimum_width_of_all_columns,
@ -807,7 +809,7 @@ impl ISizeAndMarginsComputer for FloatedTable {
let containing_block_inline_size =
self.containing_block_inline_size(block,
parent_flow_inline_size,
layout_context);
layout_context.shared_context());
initial_computed_inline_size(block,
containing_block_inline_size,
self.minimum_width_of_all_columns,
@ -842,7 +844,7 @@ impl ISizeAndMarginsComputer for AbsoluteTable {
let containing_block_inline_size =
self.containing_block_inline_size(block,
parent_flow_inline_size,
layout_context);
layout_context.shared_context());
initial_computed_inline_size(block,
containing_block_inline_size,
self.minimum_width_of_all_columns,
@ -852,9 +854,9 @@ impl ISizeAndMarginsComputer for AbsoluteTable {
fn containing_block_inline_size(&self,
block: &mut BlockFlow,
parent_flow_inline_size: Au,
layout_context: &LayoutContext)
shared_context: &SharedStyleContext)
-> Au {
AbsoluteNonReplaced.containing_block_inline_size(block, parent_flow_inline_size, layout_context)
AbsoluteNonReplaced.containing_block_inline_size(block, parent_flow_inline_size, shared_context)
}
fn solve_inline_size_constraints(&self,