Auto merge of #5990 - pcwalton:img-width-attribute-intrinsic-width, r=glennw

Fixes sites that use spacer gifs for table layout, such as the comments
page on Hacker News.

r? @glennw

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5990)
<!-- Reviewable:end -->

1 files changed, 6 insertions, 2 deletions

diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 7085ca307ab..e52c5373cae 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -1248,11 +1248,15 @@ impl Fragment {
                 result.union_block(&block_flow.base.intrinsic_inline_sizes)
             }
             SpecificFragmentInfo::Image(ref mut image_fragment_info) => {
-                let image_inline_size = image_fragment_info.image_inline_size();
+                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,
+                };
                 result.union_block(&IntrinsicISizes {
                     minimum_inline_size: image_inline_size,
                     preferred_inline_size: image_inline_size,
-                })
+                });
             }
             SpecificFragmentInfo::Canvas(ref mut canvas_fragment_info) => {
                 let canvas_inline_size = canvas_fragment_info.canvas_inline_size();