Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-16 20:03:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass SharedStyleContext to adjust_fragments_for_collapsed_margins_if_root.

Browse source
This commit is contained in:
Ms2ger 2016-06-20 10:45:21 +02:00
parent a0a62ed3fd
commit e6435b7ec4
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout/block.rs
View file

@ -58,6 +58,7 @@ use style::computed_values::{position, text_align, transform, transform_style};
use style::context::StyleContext; use style::context::StyleContext;
use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode}; use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
use style::properties::{ComputedValues, ServoComputedValues}; use style::properties::{ComputedValues, ServoComputedValues};
use style::servo::SharedStyleContext;
use style::values::computed::{LengthOrNone, LengthOrPercentageOrNone}; use style::values::computed::{LengthOrNone, LengthOrPercentageOrNone};
use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto};
use util::geometry::MAX_RECT; use util::geometry::MAX_RECT;
@ -696,8 +697,8 @@ impl BlockFlow {
/// ///
/// TODO(#2017, pcwalton): This is somewhat inefficient (traverses kids twice); can we do /// TODO(#2017, pcwalton): This is somewhat inefficient (traverses kids twice); can we do
/// better? /// better?
fn adjust_fragments_for_collapsed_margins_if_root<'a>(&mut self, fn adjust_fragments_for_collapsed_margins_if_root(&mut self,
layout_context: &'a LayoutContext<'a>) { shared_context: &SharedStyleContext) {
if !self.is_root() { if !self.is_root() {
return return
} }
@ -727,7 +728,7 @@ impl BlockFlow {
// infrastructure to make it scrollable. // infrastructure to make it scrollable.
let viewport_size = let viewport_size =
LogicalSize::from_physical(self.fragment.style.writing_mode, LogicalSize::from_physical(self.fragment.style.writing_mode,
layout_context.shared_context().viewport_size); shared_context.viewport_size);
let block_size = max(viewport_size.block, let block_size = max(viewport_size.block,
self.fragment.border_box.size.block + block_start_margin_value + self.fragment.border_box.size.block + block_start_margin_value +
block_end_margin_value); block_end_margin_value);
@ -1030,7 +1031,7 @@ impl BlockFlow {
self.fragment.inline_start_offset(), self.fragment.inline_start_offset(),
Au(0))); Au(0)));
self.base.floats = floats.clone(); self.base.floats = floats.clone();
self.adjust_fragments_for_collapsed_margins_if_root(layout_context); self.adjust_fragments_for_collapsed_margins_if_root(layout_context.shared_context());
} else { } else {
// We don't need to reflow, but we still need to perform in-order traversals if // We don't need to reflow, but we still need to perform in-order traversals if
// necessary. // necessary.