Changeset 87026 in webkit
- Timestamp:
- May 21, 2011 9:44:27 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r87025 r87026 1 2011-05-21 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Darin Adler. 4 5 <rdar://problem/9479926> REGRESSION (r82144): Icon overlaps text in Twitter message dialog 6 https://bugs.webkit.org/show_bug.cgi?id=61241 7 8 * fast/block/positioning/start-ignoring-before-expected.png: Added. 9 * fast/block/positioning/start-ignoring-before-expected.txt: Added. 10 * fast/block/positioning/start-ignoring-before.html: Added. 11 1 12 2011-05-21 Justin Schuh <jschuh@chromium.org> 2 13 -
trunk/Source/WebCore/ChangeLog
r87022 r87026 1 2011-05-21 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Darin Adler. 4 5 <rdar://problem/9479926> REGRESSION (r82144): Icon overlaps text in Twitter message dialog 6 https://bugs.webkit.org/show_bug.cgi?id=61241 7 8 Test: fast/block/positioning/start-ignoring-before.html 9 10 * rendering/RenderBlockLineLayout.cpp: 11 (WebCore::TrailingObjects::updateMidpointsForTrailingBoxes): Added a boolean parameter saying 12 whether to merge the first trailing space with the line break. 13 (WebCore::RenderBlock::LineBreaker::nextLineBreak): When adding a midpoint behind the current 14 character, account for trailing positioned objects that occurred after the midpoint by calling 15 updateMidpointsForTrailingBoxes(), which adds midpoints for them. 16 1 17 2011-05-21 Jeremy Noble <jer.noble@apple.com> 2 18 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r86698 r87026 1745 1745 void clear(); 1746 1746 void appendBoxIfNeeded(RenderBox*); 1747 void updateMidpointsForTrailingBoxes(LineMidpointState&, const InlineIterator& lBreak); 1747 1748 enum CollapseFirstSpaceOrNot { DoNotCollapseFirstSpace, CollapseFirstSpace }; 1749 1750 void updateMidpointsForTrailingBoxes(LineMidpointState&, const InlineIterator& lBreak, CollapseFirstSpaceOrNot); 1748 1751 1749 1752 private: … … 1775 1778 } 1776 1779 1777 void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMidpointState, const InlineIterator& lBreak )1780 void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMidpointState, const InlineIterator& lBreak, CollapseFirstSpaceOrNot collapseFirstSpace) 1778 1781 { 1779 1782 if (!m_whitespace) … … 1787 1790 for ( ; trailingSpaceMidpoint >= 0 && lineMidpointState.midpoints[trailingSpaceMidpoint].m_obj != m_whitespace; --trailingSpaceMidpoint) { } 1788 1791 ASSERT(trailingSpaceMidpoint >= 0); 1789 lineMidpointState.midpoints[trailingSpaceMidpoint].m_pos--; 1792 if (collapseFirstSpace == CollapseFirstSpace) 1793 lineMidpointState.midpoints[trailingSpaceMidpoint].m_pos--; 1790 1794 1791 1795 // Now make sure every single trailingPositionedBox following the trailingSpaceMidpoint properly stops and starts … … 1806 1810 } else if (!lBreak.m_obj) { 1807 1811 ASSERT(m_whitespace->isText()); 1812 ASSERT(collapseFirstSpace == CollapseFirstSpace); 1808 1813 // Add a new end midpoint that stops right at the very end. 1809 1814 unsigned length = m_whitespace->textLength(); … … 2213 2218 // before the second space. 2214 2219 addMidpoint(lineMidpointState, ignoreStart); 2220 trailingObjects.updateMidpointsForTrailingBoxes(lineMidpointState, InlineIterator(), TrailingObjects::DoNotCollapseFirstSpace); 2215 2221 } 2216 2222 } … … 2361 2367 checkMidpoints(lineMidpointState, lBreak); 2362 2368 2363 trailingObjects.updateMidpointsForTrailingBoxes(lineMidpointState, lBreak );2369 trailingObjects.updateMidpointsForTrailingBoxes(lineMidpointState, lBreak, TrailingObjects::CollapseFirstSpace); 2364 2370 2365 2371 // We might have made lBreak an iterator that points past the end
Note: See TracChangeset
for help on using the changeset viewer.