Changeset 21365 in webkit

Timestamp:

May 10, 2007 5:06:44 AM (17 years ago)

Author:

hyatt

Message:

Fix for:

<rdar://problem/5146757> REGRESSION: div that wrapped to screen width in
tiger no longer wraps

​http://bugs.webkit.org/show_bug.cgi?id=13654

Reviewed by mitz

fast/text/whitespace/normal-after-nowrap-breaking.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::calcInlinePrefWidths):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-10  David Hyatt  <hyatt@apple.com>
+
+        Fix for:
+
+        <rdar://problem/5146757> REGRESSION: div that wrapped to screen width in 
+        tiger no longer wraps
+        
+        http://bugs.webkit.org/show_bug.cgi?id=13654
+
+        Reviewed by mitz
+
+        fast/text/whitespace/normal-after-nowrap-breaking.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::calcInlinePrefWidths):
+
 2007-05-10  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -3633 +3633 @@
                                      childMin, childMax, stripFrontSpaces);
 
-                // This text object is insignificant and will not be rendered.  Just
-                // continue.
-                if (!hasBreak && childMax == 0) continue;
+                // This text object will not be rendered, but it may still provide a breaking opportunity.
+                if (!hasBreak && childMax == 0) {
+                    if (autoWrap && (beginWS || endWS)) {
+                        m_minPrefWidth = max(inlineMin, m_minPrefWidth);
+                        inlineMin = 0;
+                    }
+                    continue;
+                }
                 
                 if (stripFrontSpaces)