Auto merge of #6565 - dwins:issue_6452_image_padding, r=pcwalton

Fix for #6542 - <img> top-padding adds margin

I wrote this patch that makes the test from #6542 render as expected but I am not confident it is actually the right fix.  Should the padding be included in the 'ascent' metric for images, or am I just introducing a bug that happens to offset the one I'm trying to fix?

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6565)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-07 06:27:13 -06:00
commit 0688488a7f
12 changed files with 15 additions and 23 deletions

View file

@ -133,6 +133,7 @@ experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_at
== img_block_maxwidth_a.html img_block_maxwidth_ref.html
== img_block_maxwidth_b.html img_block_maxwidth_ref.html
== img_dynamic_remove.html img_dynamic_remove_ref.html
== img_padding_a.html img_padding_b.html
!= img_simple.html img_simple_ref.html
== img_size_a.html img_size_b.html
== img_width_attribute_intrinsic_width_a.html img_width_attribute_intrinsic_width_ref.html

View file

@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<body>
<img src="../html/rust-0.png" style='padding-top: 100px; border: 1px solid black; position:relative; height: 206px; width: 206px; left:0px; top: 0px;'>
</body>
</html>

View file

@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<body>
<img src="../html/rust-0.png" style='padding-top: 100px; border: 1px solid black;'>
</body>
</html>

View file

@ -1,3 +0,0 @@
[absolute-non-replaced-max-height-003.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[absolute-non-replaced-max-height-011.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[floats-040.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[min-height-111.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[min-height-112.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[position-absolute-002.htm]
type: reftest
expected: FAIL

View file

@ -1,3 +0,0 @@
[top-offset-percentage-001.htm]
type: reftest
expected: FAIL