Changeset 87026 in webkit

Timestamp:

May 21, 2011 9:44:27 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9479926> REGRESSION (r82144): Icon overlaps text in Twitter message dialog
​https://bugs.webkit.org/show_bug.cgi?id=61241

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/block/positioning/start-ignoring-before.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::TrailingObjects::updateMidpointsForTrailingBoxes): Added a boolean parameter saying
whether to merge the first trailing space with the line break.
(WebCore::RenderBlock::LineBreaker::nextLineBreak): When adding a midpoint behind the current
character, account for trailing positioned objects that occurred after the midpoint by calling
updateMidpointsForTrailingBoxes(), which adds midpoints for them.

LayoutTests:

• fast/block/positioning/start-ignoring-before-expected.png: Added.
• fast/block/positioning/start-ignoring-before-expected.txt: Added.
• fast/block/positioning/start-ignoring-before.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/positioning/start-ignoring-before-expected.png (added)
• LayoutTests/fast/block/positioning/start-ignoring-before-expected.txt (added)
• LayoutTests/fast/block/positioning/start-ignoring-before.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/9479926> REGRESSION (r82144): Icon overlaps text in Twitter message dialog
+        https://bugs.webkit.org/show_bug.cgi?id=61241
+
+        * fast/block/positioning/start-ignoring-before-expected.png: Added.
+        * fast/block/positioning/start-ignoring-before-expected.txt: Added.
+        * fast/block/positioning/start-ignoring-before.html: Added.
+
 2011-05-21  Justin Schuh  <jschuh@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/9479926> REGRESSION (r82144): Icon overlaps text in Twitter message dialog
+        https://bugs.webkit.org/show_bug.cgi?id=61241
+
+        Test: fast/block/positioning/start-ignoring-before.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::TrailingObjects::updateMidpointsForTrailingBoxes): Added a boolean parameter saying
+        whether to merge the first trailing space with the line break.
+        (WebCore::RenderBlock::LineBreaker::nextLineBreak): When adding a midpoint behind the current
+        character, account for trailing positioned objects that occurred after the midpoint by calling
+        updateMidpointsForTrailingBoxes(), which adds midpoints for them.
+
 2011-05-21  Jeremy Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1745 +1745 @@
     void clear();
     void appendBoxIfNeeded(RenderBox*);
-    void updateMidpointsForTrailingBoxes(LineMidpointState&, const InlineIterator& lBreak);
+
+    enum CollapseFirstSpaceOrNot { DoNotCollapseFirstSpace, CollapseFirstSpace };
+
+    void updateMidpointsForTrailingBoxes(LineMidpointState&, const InlineIterator& lBreak, CollapseFirstSpaceOrNot);
 
 private:
@@ -1775 +1778 @@
 }
 
-void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMidpointState, const InlineIterator& lBreak)
+void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMidpointState, const InlineIterator& lBreak, CollapseFirstSpaceOrNot collapseFirstSpace)
 {
     if (!m_whitespace)
@@ -1787 +1790 @@
         for ( ; trailingSpaceMidpoint >= 0 && lineMidpointState.midpoints[trailingSpaceMidpoint].m_obj != m_whitespace; --trailingSpaceMidpoint) { }
         ASSERT(trailingSpaceMidpoint >= 0);
-        lineMidpointState.midpoints[trailingSpaceMidpoint].m_pos--;
+        if (collapseFirstSpace == CollapseFirstSpace)
+            lineMidpointState.midpoints[trailingSpaceMidpoint].m_pos--;
 
         // Now make sure every single trailingPositionedBox following the trailingSpaceMidpoint properly stops and starts
@@ -1806 +1810 @@
     } else if (!lBreak.m_obj) {
         ASSERT(m_whitespace->isText());
+        ASSERT(collapseFirstSpace == CollapseFirstSpace);
         // Add a new end midpoint that stops right at the very end.
         unsigned length = m_whitespace->textLength();
@@ -2213 +2218 @@
                             // before the second space.
                             addMidpoint(lineMidpointState, ignoreStart);
+                            trailingObjects.updateMidpointsForTrailingBoxes(lineMidpointState, InlineIterator(), TrailingObjects::DoNotCollapseFirstSpace);
                         }
                     }
@@ -2361 +2367 @@
     checkMidpoints(lineMidpointState, lBreak);
 
-    trailingObjects.updateMidpointsForTrailingBoxes(lineMidpointState, lBreak);
+    trailingObjects.updateMidpointsForTrailingBoxes(lineMidpointState, lBreak, TrailingObjects::CollapseFirstSpace);
 
     // We might have made lBreak an iterator that points past the end