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

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: add missing expectations lines 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 3b6d47544e3482ca220adb33a23e07597a35cbcb..7683440cacad35c700e53b947f177b64439aa335 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 (layer() && layer()->marquee() && layer()->marquee()->isHorizontal())
- minLogicalWidth = 0;
- }
+ // A horizontal marquee with inline children has no minimum width.
+ if (childrenInline() && layer() && layer()->marquee() && layer()->marquee()->isHorizontal())
+ minLogicalWidth = 0;
if (isTableCell()) {
Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth();

Powered by Google App Engine
This is Rietveld 408576698