REGRESSION(r142152): Text wraps in menu
authorrobert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Apr 2013 19:48:51 +0000 (19:48 +0000)
committerrobert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 6 Apr 2013 19:48:51 +0000 (19:48 +0000)
commit5650039986d2ae6b3b42142e315958182ddc87db
treeda24edded93b71318ad1dd4041555fdfbe79a20f
parent4f4ed584c9e2b41354c770d16b89686c6ddabb7f
REGRESSION(r142152): Text wraps in menu
https://bugs.webkit.org/show_bug.cgi?id=113706

Reviewed by David Hyatt.

Source/WebCore:

* rendering/RenderBlockLineLayout.cpp:
(WebCore::inlineLogicalWidth): Empty inline elements add their inline border/padding/margin to the width of the
line when we iterate through them in nextLineBreak(), so no need to add them again here when climbing back up
from their first child looking for border/padding/margin to add. (An empty inline element can have floating children.)

LayoutTests:

* fast/inline/inline-with-empty-inline-children-expected.txt:
* fast/inline/inline-with-empty-inline-children.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/inline/inline-with-empty-inline-children-expected.txt
LayoutTests/fast/inline/inline-with-empty-inline-children.html
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlockLineLayout.cpp