Changeset 153061 in webkit

Timestamp:

Jul 23, 2013, 12:47:34 PM (12 years ago)

Author:

Alan Bujtas

Message:

REGRESSION(r152313): Links in certain twitter postings don't warp correctly on page
​https://bugs.webkit.org/show_bug.cgi?id=118435

Reviewed by David Hyatt.

When we find an empty inline in the middle of the word, prefer breaking it before
instead of after to match other browsers' rendering.

Source/WebCore:

Test: fast/text/whitespace/inline-whitespace-wrapping-12.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::canBreakAtThisPosition):

LayoutTests:

• fast/text/whitespace/inline-whitespace-wrapping-12-expected.html: Added.
• fast/text/whitespace/inline-whitespace-wrapping-12.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-12-expected.html (added)
• LayoutTests/fast/text/whitespace/inline-whitespace-wrapping-12.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-23  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r152313): Links in certain twitter postings don't warp correctly on page
+        https://bugs.webkit.org/show_bug.cgi?id=118435
+
+        Reviewed by David Hyatt.
+
+        When we find an empty inline in the middle of the word, prefer breaking it before 
+        instead of after to match other browsers' rendering.
+
+        * fast/text/whitespace/inline-whitespace-wrapping-12-expected.html: Added.
+        * fast/text/whitespace/inline-whitespace-wrapping-12.html: Added.
+
 2013-07-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-23  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r152313): Links in certain twitter postings don't warp correctly on page
+        https://bugs.webkit.org/show_bug.cgi?id=118435
+
+        Reviewed by David Hyatt.
+
+        When we find an empty inline in the middle of the word, prefer breaking it before 
+        instead of after to match other browsers' rendering.
+
+        Test: fast/text/whitespace/inline-whitespace-wrapping-12.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::canBreakAtThisPosition):
+
 2013-07-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2908 +2908 @@
     bool canPlaceOnLine = width.fitsOnLine() || !autoWrapWasEverTrueOnLine;
 
-    // If we are an empty inline in the middle of a word and don't fit on the line then clear any line break we have and find
-    // one in the following text instead.
-    if (!canPlaceOnLine && !canBreakHere && isEmptyInline(current.m_obj))
-        lBreak.clear();
-    else if (canPlaceOnLine && canBreakHere)
+    if (canPlaceOnLine && canBreakHere)
         commitLineBreakAtCurrentWidth(width, lBreak, next);