Chromium Code Reviews| Index: Source/core/rendering/RenderBlock.cpp |
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
| index be6d90263416d5ef3b53e4dbea77cae80eb3a39d..ce626f35d70226133af889b476da1a2dbda896b9 100644 |
| --- a/Source/core/rendering/RenderBlock.cpp |
| +++ b/Source/core/rendering/RenderBlock.cpp |
| @@ -5773,12 +5773,9 @@ void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay |
| maxLogicalWidth = max(minLogicalWidth, maxLogicalWidth); |
| - if (!style()->autoWrap() && childrenInline()) { |
| - minLogicalWidth = maxLogicalWidth; |
| - // A horizontal marquee with inline children has no minimum width. |
| - if (isMarquee() && toRenderMarquee(this)->isHorizontal()) |
| - minLogicalWidth = 0; |
| - } |
| + // A horizontal marquee with inline children has no minimum width. |
| + if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal()) |
|
esprehn
2013/06/18 02:10:03
This change doesn't look related to this patch and
ojan
2013/06/18 03:33:46
It's removing the minLogicalWidth = maxLogicalWidt
|
| + minLogicalWidth = 0; |
| if (isTableCell()) { |
| Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth(); |