aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-12-12 03:25:03 -0800
committerGitHub <noreply@github.com>2016-12-12 03:25:03 -0800
commit1993b6e812de30de06100e7d52c1d90af929f24f (patch)
tree909da2600ac4dd9282326c6931ed6b83190750ba /components/layout/inline.rs
parent7eb7d7adb2ab10642193f013f59fa93dd042d41a (diff)
parent7bca3034b2d3d9aa2634d3ca5b7471fed254b770 (diff)
downloadservo-1993b6e812de30de06100e7d52c1d90af929f24f.tar.gz
servo-1993b6e812de30de06100e7d52c1d90af929f24f.zip
Auto merge of #14490 - stshine:replaced-size, r=emilio
layout: Unify size calculation of replaced elements <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14490) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 57eb16f1b84..cefb77bb592 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -1394,11 +1394,9 @@ impl Flow for InlineFlow {
debug!("assign_block_size_inline: floats in: {:?}", self.base.floats);
// Assign the block-size and late-computed inline-sizes for the inline fragments.
- let containing_block_block_size =
- self.base.block_container_explicit_block_size;
for fragment in &mut self.fragments.fragments {
fragment.update_late_computed_replaced_inline_size_if_necessary();
- fragment.assign_replaced_block_size_if_necessary(containing_block_block_size);
+ fragment.assign_replaced_block_size_if_necessary();
}
// Reset our state, so that we handle incremental reflow correctly.