Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Take the style-specified width into account when computing the

Browse source 
intrinsic inline sizes of images.

Improves Facebook Timeline.
This commit is contained in:
Patrick Walton 2015-08-18 18:32:18 -07:00
parent 19d466b062
commit 66473625db
4 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/layout/fragment.rs
View file

@ -1265,10 +1265,16 @@ impl Fragment {
result.union_block(&block_flow.base.intrinsic_inline_sizes)
}
SpecificFragmentInfo::Image(ref mut image_fragment_info) => {
let image_inline_size = match image_fragment_info.replaced_image_fragment_info
.dom_inline_size {
None => image_fragment_info.image_inline_size(),
Some(dom_inline_size) => dom_inline_size,
// FIXME(pcwalton): Shouldn't `width` and `height` be preshints?
let image_inline_size = match (image_fragment_info.replaced_image_fragment_info
.dom_inline_size,
self.style.content_inline_size()) {
(None, LengthOrPercentageOrAuto::Auto) |
(None, LengthOrPercentageOrAuto::Percentage(_)) => {
image_fragment_info.image_inline_size()
}
(Some(dom_inline_size), _) => dom_inline_size,
(None, LengthOrPercentageOrAuto::Length(length)) => length,
};
result.union_block(&IntrinsicISizes {
minimum_inline_size: image_inline_size,