auto merge of #1399 : pcwalton/servo/store-image-dimensions, r=kmcallister

the DOM for them.

r? @kmcallister
This commit is contained in:
bors-servo 2013-12-12 18:22:18 -08:00
commit c168e04fe1
3 changed files with 35 additions and 49 deletions

View file

@ -733,7 +733,7 @@ impl Flow for InlineFlow {
// FIXME(pcwalton): Move into `box.rs` like the rest of box-specific layout code?
let (top_from_base, bottom_from_base, ascent) = match cur_box.specific {
ImageBox(ref image_box) => {
let mut height = image_box.image_height(cur_box);
let mut height = image_box.image_height();
// TODO: margin, border, padding's top and bottom should be calculated in
// advance, since baseline of image is bottom margin edge.