Changeset 148358 in webkit
- Timestamp:
- Apr 13, 2013 9:38:41 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r148310 r148358 1 2013-04-13 Antoine Quint <graouts@apple.com> 2 3 Width of last of consecutive tabs may be incorrect with "white-space: pre-wrap" 4 https://bugs.webkit.org/show_bug.cgi?id=114562 5 6 Reviewed by Dan Bernstein. 7 8 * fast/text/tab-last-word-in-renderer-pre-wrap-expected.html: Added. 9 * fast/text/tab-last-word-in-renderer-pre-wrap.html: Added. 10 1 11 2013-04-12 Alexey Proskuryakov <ap@apple.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r148357 r148358 1 2013-04-13 Antoine Quint <graouts@apple.com> 2 3 Width of last of consecutive tabs may be incorrect with "white-space: pre-wrap" 4 https://bugs.webkit.org/show_bug.cgi?id=114562 5 6 Reviewed by Dan Bernstein. 7 8 When we measure the last word of a RenderText, make sure we use the correct x 9 position taking into account the current accumulated word measurements up to 10 this character. This is of particular importance in the case of tabs where the 11 measured width would differ based on the x position. 12 13 Test: fast/text/tab-last-word-in-renderer-pre-wrap.html 14 15 * rendering/RenderBlockLineLayout.cpp: 16 (WebCore::setLogicalWidthForTextRun): 17 1 18 2013-04-13 Mark Salisbury <mark.salisbury@hp.com> 2 19 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r148223 r148358 865 865 if (kerningIsEnabled && lastEndOffset == run->m_stop) { 866 866 int wordLength = lastEndOffset - wordMeasurement.startOffset; 867 measuredWidth += renderer->width(wordMeasurement.startOffset, wordLength, xPos , lineInfo.isFirstLine());867 measuredWidth += renderer->width(wordMeasurement.startOffset, wordLength, xPos + measuredWidth, lineInfo.isFirstLine()); 868 868 if (i > 0 && wordLength == 1 && renderer->characterAt(wordMeasurement.startOffset) == ' ') 869 869 measuredWidth += renderer->style()->wordSpacing();
Note: See TracChangeset
for help on using the changeset viewer.