Changeset 52889 in webkit

Timestamp:

Jan 6, 2010 5:41:32 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/7488126> With text-rendering: optimizelegibility, sometimes lines run too long
​https://bugs.webkit.org/show_bug.cgi?id=32794

Reviewed by Sam Weinig.

WebCore:

Test: platform/mac/fast/text/line-breaking-with-kerning.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::findNextLineBreak): When kerning is enabled, include
the trailing space when measuring a word, then subtract its width. This
accounts for kerning between the last glyph of the word and the following space.

LayoutTests:

• platform/mac/fast/text/line-breaking-with-kerning-expected.checksum: Added.
• platform/mac/fast/text/line-breaking-with-kerning-expected.png: Added.
• platform/mac/fast/text/line-breaking-with-kerning-expected.txt: Added.
• platform/mac/fast/text/line-breaking-with-kerning.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/line-breaking-with-kerning-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/line-breaking-with-kerning-expected.png (added)
• LayoutTests/platform/mac/fast/text/line-breaking-with-kerning-expected.txt (added)
• LayoutTests/platform/mac/fast/text/line-breaking-with-kerning.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-06  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/7488126> With text-rendering: optimizelegibility, sometimes lines run too long
+        https://bugs.webkit.org/show_bug.cgi?id=32794
+
+        * platform/mac/fast/text/line-breaking-with-kerning-expected.checksum: Added.
+        * platform/mac/fast/text/line-breaking-with-kerning-expected.png: Added.
+        * platform/mac/fast/text/line-breaking-with-kerning-expected.txt: Added.
+        * platform/mac/fast/text/line-breaking-with-kerning.html: Added.
+
 2010-01-06  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-06  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/7488126> With text-rendering: optimizelegibility, sometimes lines run too long
+        https://bugs.webkit.org/show_bug.cgi?id=32794
+
+        Test: platform/mac/fast/text/line-breaking-with-kerning.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::findNextLineBreak): When kerning is enabled, include
+        the trailing space when measuring a word, then subtract its width. This
+        accounts for kerning between the last glyph of the word and the following space.
+
 2010-01-06  Kevin Decker  <kdecker@apple.com>
 

trunk/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1805 +1805 @@
             int lastSpaceWordSpacing = 0;
 
+            TextRenderingMode textRenderingMode = f.fontDescription().textRenderingMode();
+            // Non-zero only when kerning is enabled, in which case we measure words with their trailing
+            // space, then subtract its width.
+            int wordTrailingSpaceWidth = textRenderingMode == OptimizeLegibility || textRenderingMode == GeometricPrecision ? f.spaceWidth() + wordSpacing : 0;
+
             int wrapW = tmpW + inlineWidth(o, !appliedStartWidth, true);
             int charWidth = 0;
@@ -1899 +1904 @@
                     }
 
-                    int additionalTmpW = textWidth(t, lastSpace, pos - lastSpace, f, w + tmpW, isFixedPitch, collapseWhiteSpace) + lastSpaceWordSpacing;
+                    int additionalTmpW;
+                    if (wordTrailingSpaceWidth && currentCharacterIsSpace)
+                        additionalTmpW = textWidth(t, lastSpace, pos + 1 - lastSpace, f, w + tmpW, isFixedPitch, collapseWhiteSpace) - wordTrailingSpaceWidth + lastSpaceWordSpacing;
+                    else
+                        additionalTmpW = textWidth(t, lastSpace, pos - lastSpace, f, w + tmpW, isFixedPitch, collapseWhiteSpace) + lastSpaceWordSpacing;
                     tmpW += additionalTmpW;
                     if (!appliedStartWidth) {