Title: [136281] branches/chromium/1312
- Revision
- 136281
- Author
- cev...@google.com
- Date
- 2012-11-30 15:01:50 -0800 (Fri, 30 Nov 2012)
Log Message
Merge 136034
BUG=146882
Review URL: https://codereview.chromium.org/11299286
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1312/LayoutTests/fast/text/tab-with-kerning-expected.html (from rev 136034, trunk/LayoutTests/fast/text/tab-with-kerning-expected.html) (0 => 136281)
--- branches/chromium/1312/LayoutTests/fast/text/tab-with-kerning-expected.html (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/text/tab-with-kerning-expected.html 2012-11-30 23:01:50 UTC (rev 136281)
@@ -0,0 +1,3 @@
+<div style="font: 20px ahem; -webkit-font-smoothing: none; color: orange; -webkit-font-kerning: none;">
+ .<span style="white-space: pre-wrap; background-color: blue;">	 ab</span>ef
+</div>
Copied: branches/chromium/1312/LayoutTests/fast/text/tab-with-kerning.html (from rev 136034, trunk/LayoutTests/fast/text/tab-with-kerning.html) (0 => 136281)
--- branches/chromium/1312/LayoutTests/fast/text/tab-with-kerning.html (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/text/tab-with-kerning.html 2012-11-30 23:01:50 UTC (rev 136281)
@@ -0,0 +1,3 @@
+<div style="font: 20px ahem; -webkit-font-smoothing: none; color: orange; -webkit-font-kerning: auto;">
+ .<span style="white-space: pre-wrap; background-color: blue;">	 ab</span>ef
+</div>
Modified: branches/chromium/1312/Source/WebCore/rendering/RenderBlockLineLayout.cpp (136280 => 136281)
--- branches/chromium/1312/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-11-30 23:00:41 UTC (rev 136280)
+++ branches/chromium/1312/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-11-30 23:01:50 UTC (rev 136281)
@@ -2627,7 +2627,7 @@
wordMeasurement.startOffset = lastSpace;
float additionalTmpW;
- if (wordTrailingSpaceWidth && currentCharacterIsSpace)
+ if (wordTrailingSpaceWidth && c == ' ')
additionalTmpW = textWidth(t, lastSpace, current.m_pos + 1 - lastSpace, f, width.currentWidth(), isFixedPitch, collapseWhiteSpace, &wordMeasurement.fallbackFonts, textLayout) - wordTrailingSpaceWidth;
else
additionalTmpW = textWidth(t, lastSpace, current.m_pos - lastSpace, f, width.currentWidth(), isFixedPitch, collapseWhiteSpace, &wordMeasurement.fallbackFonts, textLayout);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
