Regression r130057: incorrect block pref width for alternating InlineFlow and inline...
authorleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Oct 2012 21:29:31 +0000 (21:29 +0000)
committerleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Oct 2012 21:29:31 +0000 (21:29 +0000)
commit4d7f11c6b6f039f3da5af72436c81d235da6088f
tree58d05a298e0aed46d9f0b069cc135d5a4de05260
parentd1357c9b20817f1c28f9d702bc05feb2853bb7d0
Regression r130057: incorrect block pref width for alternating InlineFlow and inline Replaced
https://bugs.webkit.org/show_bug.cgi?id=99194

Reviewed by Eric Seidel.

Source/WebCore:

Correctly breaking lines after inline replaced elements that follow inline flows. Previously, alternating
these two types of elements would cause us to increase our preferred width forever.

Test: fast/block/block-with-inline-replaced-children-in-inline-flows.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeInlinePreferredLogicalWidths):

LayoutTests:

* fast/block/block-with-inline-replaced-children-in-inline-flows-expected.html: Added.
* fast/block/block-with-inline-replaced-children-in-inline-flows.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@131359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/block/block-with-inline-replaced-children-in-inline-flows-expected.html [new file with mode: 0644]
LayoutTests/fast/block/block-with-inline-replaced-children-in-inline-flows.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp