aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2016-06-22 13:44:15 +0200
committerMs2ger <Ms2ger@gmail.com>2016-06-22 14:29:36 +0200
commitc33ac876ff4101703b11b1742ec5e117c21000a6 (patch)
treea65db5c6bf1db6b7232f807a15d7b92dc79dcee8
parent21b8d2bd91a7199399d55805f709448ca410a8b9 (diff)
downloadservo-c33ac876ff4101703b11b1742ec5e117c21000a6.tar.gz
servo-c33ac876ff4101703b11b1742ec5e117c21000a6.zip
Pass SharedStyleContext to propagate_and_compute_used_inline_size.
-rw-r--r--components/layout/block.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs
index 1f9396e6596..03b04d2f81e 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -1295,9 +1295,9 @@ impl BlockFlow {
/// Compute inline size based using the `block_container_inline_size` set by the parent flow.
///
/// This is run in the `AssignISizes` traversal.
- fn propagate_and_compute_used_inline_size(&mut self, layout_context: &LayoutContext) {
+ fn propagate_and_compute_used_inline_size(&mut self, shared_context: &SharedStyleContext) {
let containing_block_inline_size = self.base.block_container_inline_size;
- self.compute_used_inline_size(layout_context.shared_context(), containing_block_inline_size);
+ self.compute_used_inline_size(shared_context, containing_block_inline_size);
if self.base.flags.is_float() {
self.float.as_mut().unwrap().containing_inline_size = containing_block_inline_size
}
@@ -1640,7 +1640,7 @@ impl BlockFlow {
// Our inline-size was set to the inline-size of the containing block by the flow's parent.
// Now compute the real value.
- self.propagate_and_compute_used_inline_size(layout_context);
+ self.propagate_and_compute_used_inline_size(layout_context.shared_context());
// Now for some speculation.
match self.formatting_context_type() {