Changeset 150602 in webkit
- Timestamp:
- May 23, 2013 11:55:53 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r150596 r150602 1 2013-05-18 Robert Hogan <robert@webkit.org> 2 3 The ellipsis in a text overflow should not avoid floats 4 https://bugs.webkit.org/show_bug.cgi?id=115746 5 6 Reviewed by David Hyatt. 7 8 * fast/css/text-overflow-ellipsis-behind-floats-expected.html: Added. 9 * fast/css/text-overflow-ellipsis-behind-floats.html: Added. 10 * fast/css/text-overflow-ellipsis-full-truncate-rtl-expected.html: 11 * fast/css/text-overflow-ellipsis-full-truncate-rtl.html: 12 Change this test to expect the text to cross into the floating input element 13 and render the ellipsis at the left extreme of the element. The previous expected 14 rendering relied on the incorrect premise that an overflow ellipsis should avoid 15 floated elements. 16 1 17 2013-05-23 Ryosuke Niwa <rniwa@webkit.org> 2 18 -
trunk/LayoutTests/fast/css/text-overflow-ellipsis-full-truncate-rtl-expected.html
r150065 r150602 15 15 <body> 16 16 <p dir='ltr'>This tests that ellipsis is placed correctly, when full truncation takes over in an rtl flow.</p> 17 <div style='width:582px;'><input type="text" size='74'>consectetur adipisicing elit , sed do eiusmod</div>17 <div style='width:582px;'><input type="text" size='74'>consectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elit, sed do eiusmod</div> 18 18 </body> 19 19 </div> -
trunk/LayoutTests/fast/css/text-overflow-ellipsis-full-truncate-rtl.html
r150065 r150602 15 15 <body> 16 16 <p dir='ltr'>This tests that ellipsis is placed correctly, when full truncation takes over in an rtl flow.</p> 17 <div style='width:582px;'><input type="text" size='74'><span>Lorem ipsum dolor sit</span>consectetur adipisicing elit </div>17 <div style='width:582px;'><input type="text" size='74'><span>Lorem ipsum dolor sit</span>consectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elitconsectetur adipisicing elit</div> 18 18 </body> 19 19 </div> -
trunk/Source/WebCore/ChangeLog
r150590 r150602 1 2013-05-18 Robert Hogan <robert@webkit.org> 2 3 The ellipsis in a text overflow should not avoid floats 4 https://bugs.webkit.org/show_bug.cgi?id=115746 5 6 Reviewed by David Hyatt. 7 8 When placing an ellipsis for text overflow we shouldn't avoid any floats on the line. 9 That is to say, if there is a float in the box we overflow we should let our no-wrap text, 10 including the ellipsis, render inside the float just as we would if overflow was hidden but 11 a text-overflow rendering had not been specified. 12 13 Test: fast/css/text-overflow-ellipsis-behind-floats.html 14 15 * rendering/RenderBlockLineLayout.cpp: 16 (WebCore::RenderBlock::checkLinesForTextOverflow): 17 1 18 2013-05-23 Christophe Dumez <ch.dumez@sisa.samsung.com> 2 19 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r150478 r150602 3498 3498 // FIXME: Use pixelSnappedLogicalRightOffsetForLine instead of snapping it ourselves once the column workaround in said method has been fixed. 3499 3499 // https://bugs.webkit.org/show_bug.cgi?id=105461 3500 int blockRightEdge = snapSizeToPixel(l ogicalRightOffsetForLine(curr->lineTop(), firstLine), curr->x());3501 int blockLeftEdge = pixelSnappedLogicalLeftOffsetForLine(curr->lineTop(), firstLine);3500 int blockRightEdge = snapSizeToPixel(ltr ? logicalRightOffsetForContent(curr->lineTop()) : logicalRightOffsetForLine(curr->lineTop(), firstLine), curr->x()); 3501 int blockLeftEdge = ltr ? pixelSnappedLogicalLeftOffsetForLine(curr->lineTop(), firstLine).toInt() : snapSizeToPixel(logicalLeftOffsetForContent(curr->lineTop()), curr->x()); 3502 3502 int lineBoxEdge = ltr ? snapSizeToPixel(curr->x() + curr->logicalWidth(), curr->x()) : snapSizeToPixel(curr->x(), 0); 3503 3503 if ((ltr && lineBoxEdge > blockRightEdge) || (!ltr && lineBoxEdge < blockLeftEdge)) { … … 3513 3513 3514 3514 float logicalLeft = 0; // We are only intersted in the delta from the base position. 3515 float truncatedWidth = pixelSnappedLogicalRightOffsetForLine(curr->lineTop(), firstLine);3515 float truncatedWidth = snapSizeToPixel(logicalRightOffsetForContent(curr->lineTop()), curr->x()); 3516 3516 updateLogicalWidthForAlignment(textAlign, 0, logicalLeft, totalLogicalWidth, truncatedWidth, 0); 3517 3517 if (ltr)
Note: See TracChangeset
for help on using the changeset viewer.