Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1221)

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 17072005: Floated elements inside a white-space:nowrap container should still wrap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: now sans binary files. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 5fd8b755ff0924efbfbda017f9bd053c0a10c1e2..7746d1849feb396f05c24a307ce8022b668c97c6 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())
+ minLogicalWidth = 0;
if (isTableCell()) {
Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth();
« no previous file with comments | « LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug57828-expected.txt ('k') | Source/core/rendering/RenderText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698