diff options
6 files changed, 79 insertions, 2 deletions
diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog index 40c46ee..0e9dfae 100644 --- a/third_party/WebKit/LayoutTests/ChangeLog +++ b/third_party/WebKit/LayoutTests/ChangeLog @@ -1,3 +1,15 @@ +2006-04-02 Mitz Pettel <opendarwin.org@mitzpettel.com> + + Reviewed by Darin. + + - Test for http://bugzilla.opendarwin.org/show_bug.cgi?id=8118 + REGRESSION (r13595): Inline block's clipped overflow increases table row height + + * fast/inline-block/overflow-clip-expected.checksum: Added. + * fast/inline-block/overflow-clip-expected.png: Added. + * fast/inline-block/overflow-clip-expected.txt: Added. + * fast/inline-block/overflow-clip.html: Added. + 2006-04-01 Darin Adler <darin@apple.com> Reviewed by Justin. diff --git a/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip-expected.checksum b/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip-expected.checksum new file mode 100644 index 0000000..8f544ac --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip-expected.checksum @@ -0,0 +1 @@ +9ac9856a90ee2ec2c78ec27f26bb2481
\ No newline at end of file diff --git a/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip-expected.txt b/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip-expected.txt new file mode 100644 index 0000000..37bfbf5 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip-expected.txt @@ -0,0 +1,30 @@ +layer at (0,0) size 800x600 + RenderCanvas at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x36 + RenderText {TEXT} at (0,0) size 104x18 + text run at (0,0) width 104: "This is a test for " + RenderInline {I} at (0,0) size 754x36 + RenderInline {A} at (0,0) size 348x18 [color=#0000EE] + RenderText {TEXT} at (104,0) size 348x18 + text run at (104,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=8118" + RenderText {TEXT} at (452,0) size 754x36 + text run at (452,0) width 302: " REGRESSION (r13595): Inline block's clipped" + text run at (0,18) width 225: "overflow increases table row height" + RenderText {TEXT} at (225,18) size 4x18 + text run at (225,18) width 4: "." + RenderBlock {P} at (0,52) size 784x18 + RenderText {TEXT} at (0,0) size 268x18 + text run at (0,0) width 268: "You should see a green square and no red." + RenderTable {TABLE} at (0,86) size 100x100 [bgcolor=#FF0000] + RenderTableSection {TBODY} at (0,0) size 0x100 + RenderTableRow {TR} at (0,0) size 0x0 + RenderTableCell {TD} at (0,0) size 100x100 [r=0 c=0 rs=1 cs=1] + RenderText {TEXT} at (0,0) size 0x0 +layer at (8,94) size 100x100 scrollHeight 200 + RenderBlock {DIV} at (0,0) size 100x100 + RenderBlock (anonymous) at (0,0) size 100x0 + RenderText {TEXT} at (0,0) size 0x0 + RenderBlock {DIV} at (0,0) size 100x200 [bgcolor=#008000] diff --git a/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip.html b/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip.html new file mode 100644 index 0000000..cfb4679 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/inline-block/overflow-clip.html @@ -0,0 +1,21 @@ +<html> +<head></head> +<body> +<p> +This is a test for <i><a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=8118">http://bugzilla.opendarwin.org/show_bug.cgi?id=8118</a> +REGRESSION (r13595): Inline block's clipped overflow increases table row height</i>. +</p> +<p> +You should see a green square and no red. +</p> +<table style="background: red;" cellpadding="0" cellspacing="0"> + <tr> + <td> + <div style="display: inline-block; overflow: hidden; height: 100px; width: 100px;"> + <div style="width: 100px; height: 200px; background: green;"></div> + </div> + </td> + </tr> +</table> +</body> +</html> diff --git a/third_party/WebKit/WebCore/ChangeLog b/third_party/WebKit/WebCore/ChangeLog index 735d62d..4cc98f4 100644 --- a/third_party/WebKit/WebCore/ChangeLog +++ b/third_party/WebKit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2006-04-02 Mitz Pettel <opendarwin.org@mitzpettel.com> + + Test: fast/inline-block/overflow-clip.html + + Reviewed by Darin. + + - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=8118 + REGRESSION (r13595): Inline block's clipped overflow increases table row height + + * rendering/render_line.cpp: + (WebCore::InlineFlowBox::placeBoxesVertically): Don't look at interior overflow + when calculating the contribution to the inline's vertical overflows. + 2006-04-02 Eric Seidel <eseidel@apple.com> Reviewed by andersca. diff --git a/third_party/WebKit/WebCore/rendering/render_line.cpp b/third_party/WebKit/WebCore/rendering/render_line.cpp index 8946f35..0bb849d 100644 --- a/third_party/WebKit/WebCore/rendering/render_line.cpp +++ b/third_party/WebKit/WebCore/rendering/render_line.cpp @@ -693,8 +693,8 @@ void InlineFlowBox::placeBoxesVertically(int y, int maxHeight, int maxAscent, bo else if (!curr->object()->isBR()) { newY += curr->object()->marginTop(); newHeight = curr->height() - (curr->object()->marginTop() + curr->object()->marginBottom()); - overflowTop = curr->object()->overflowTop(); - overflowBottom = curr->object()->overflowHeight() - newHeight; + overflowTop = curr->object()->overflowTop(false); + overflowBottom = curr->object()->overflowHeight(false) - newHeight; } curr->setYPos(newY); |