Diff
Modified: trunk/LayoutTests/ChangeLog (137785 => 137786)
--- trunk/LayoutTests/ChangeLog 2012-12-14 23:47:29 UTC (rev 137785)
+++ trunk/LayoutTests/ChangeLog 2012-12-14 23:52:00 UTC (rev 137786)
@@ -1,3 +1,17 @@
+2012-12-14 Yuki Sekiguchi <yuki.sekigu...@access-company.com>
+
+ Emphasis mark is printed after inline-block with justify
+ https://bugs.webkit.org/show_bug.cgi?id=104631
+
+ Reviewed by Dean Jackson.
+
+ Test that emphasis marks are not drawn incorrectly in justified text with inline boxes.
+
+ * fast/inline/justify-emphasis-inline-box.html: Added.
+ * platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.png: Added.
+ * platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
+ * platform/mac/fast/inline/justify-emphasis-inline-box-expected.txt: Added.
+
2012-12-14 Beth Dakin <bda...@apple.com>
Updating these results again since this failing test has started failing in a new
Added: trunk/LayoutTests/fast/inline/justify-emphasis-inline-box.html (0 => 137786)
--- trunk/LayoutTests/fast/inline/justify-emphasis-inline-box.html (rev 0)
+++ trunk/LayoutTests/fast/inline/justify-emphasis-inline-box.html 2012-12-14 23:52:00 UTC (rev 137786)
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+<!-- There should be no emphasis mark at the top of first line(span's position). -->
+<div style="text-align:justify;-webkit-text-emphasis-style: dot filled; width: 200px; font-family: Ahem">
+<span style="display: inline-block"></span>あaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+</div>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (137785 => 137786)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-14 23:47:29 UTC (rev 137785)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-14 23:52:00 UTC (rev 137786)
@@ -4237,3 +4237,6 @@
webkit.org/b/104848 [ Linux XP SnowLeopard Lion Release ] fast/frames/sandboxed-iframe-attribute-parsing.html [ Pass Failure ]
webkit.org/b/104848 [ SnowLeopard Debug ] fast/frames/sandboxed-iframe-attribute-parsing.html [ Pass Failure ]
webkit.org/b/104848 [ Release ] fast/frames/sandboxed-iframe-parsing-space-characters.html [ Pass Failure ]
+
+# New test
+webkit.org/b/104631 fast/inline/justify-emphasis-inline-box.html [ Missing ]
Added: trunk/LayoutTests/platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.png (0 => 137786)
--- trunk/LayoutTests/platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.png (rev 0)
+++ trunk/LayoutTests/platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.png 2012-12-14 23:52:00 UTC (rev 137786)
@@ -0,0 +1,8 @@
+\x89PNG
+
+
+IHDR X \x9Av\x82p )tEXtchecksum 658bc141df70ef30f97f2c6c0a44e64d\xBC\x96 \xC2IDATx\x9C\xED\xDDO\xA8\xA6s\xC0\xF1\xEB\xBCc\xA2\xB1\xA2C\xFE\xA4\xE8HX f!\xCAp\xB6v\x92\x92B\xEAev\xEC&j\xF6\x96S\xAC\xB39e,e\xC4f6\xC3
+S6\xFED3\x99A3i\xC4\xC2y\xAFԫ\x98\xF4z\xBF\x8F\xE7\xCC\xE7\xB3z:\xF7}\x9D\xAE\xED\xB7\xFB~\x9E\xDF\xCA\xF6\xF6\xF6\xF6 \xFE\xB5\xE8 \x80\x8B\x87 2 \xC8 #@ \x80\x8C 2\x97,z\xF8\xA78y\xF2\xE4\xBC\xF5\xD6[x\xFD\xBA뮛 |0\xDC `\xE7Yq\xFC\xC7{\xEF\xBD7\xFB\xF6\xED\xFB\xC3\xEB\xFB\xF6\xED\x9Bw\xDF}\xB7[ `\xF2
+ \x90 @F\x80 d \x90 @\xC69 \xF0\xABk\xAF\xBDv677\xFF\xF0\xFA-\xB7\xDCn \xB039~\xE7\xED\xB7ߞ\xFD\xFB\xF7ω'\xBD
+ \xC0\x8E\xE3 \xFC\xCEٳg\xE7\x86n\xF8\xAF\xBF}\xF3\xCD7s\xECر\xF9\xEE\xBB\xEF\xE6\xC9'\x9F\\xD0f \xCBO\x80\xC0\xCC<\xFA\xE8\xA3s\xEEܹ\xB9\xFC\xF2\xCB\xE7\xCB/\xBF\x9C/\xBE\xF8b\xEE\xBD\xF7\xDE9u\xEAԜ>}zVWW\xE7\xE6\x9Bo\x9E x`ѫ ,5\xAF`\xC1̜8qb\xBE\xFD\xF6\xDB9\xFE\xFC\xBC\xFE\xFA\xEB\xF3\xE3\x8F?\xCE /\xBC0\xAB\xAB\xABs\xD5UWͧ\x9F~:\xB7\xDF~\xFB\xAC\xAC\xAC,zU \x80\xA5\xE6 \xCC\xCCm\xB7\xDD\xF6\xDB\xE7\xF7\xDFv\xEF\xDE=\xEB\xEB\xEB33s\xE6̙\xB9\xF3\xCE;端\xBE\x9A\xD5\xD5\xD5E\xAD \xB0#\xF8^\xF8\x9D\x93'OΛo\xBE9s뭷\xCE\xFA\xFA\xFA\xECٳg\xDEx\xE3\x8D9{\xF6\xEC\xA2\xD7 Xj~\xF5\xF9\xE7\x9F\xCF\xFD\xF7\xDF?[[[\xB3w\xEF\xDE9t\xE8\xD0|\xF4\xD1G\xB3\xBA\xBA: \x98\xAD\xAD\xAD\xB9\xE3\x8E;\xE6\xE3\x8F?^\xF4\xAA KK\x80\xC0\xCC|\xF6\xD9g\xB3\xB1\xB11O=\xF5\xD4<\xF3\xCC3\xB3\xB6\xB66kkk\xB3\xB5\xB55W_}\xF5<\xFB\xEC\xB3s\xF4\xE8\xD1y\xE4\x91G\xE6\xF1\xC7 _\xF4\xBA KK\x80\xC0\xCC\xEC߿677\xE7\xB1\xC7 \x9B\xCB.\xBBlΟ??\xE7Ν\x9B\xE7\x9F~^|\xF1\xC5\xDF\xEE{\xFA\xE9\xA7\xE7\xC3?\x9CS\xA7N-p[ \x80\xE5\xE5K\xE8\\xF4N\x9F>=G\x8F \x9D\xAD\xAD\xAD\x99\x99\xB9\xF2\xCA+\xE7\x93O>\x99\xCD\xCD\xCDy衇\xE6\xEE\xBB\xEF\xFE\xEDޟ~\xFAiv\xED\xDA5\x97^z\xE9\xA2\xD6 Xj\x9E\x80p\xD1\xFB\xFA\xEB\xAF\xE7\xFA믟ݻw\xCF\xCC̍7\xDE8\x87 \x9E3g\xCE\xCC\xC1\x83\xFF\xEB\xDEW^ye\xEE\xB9瞹\xE2\x8A+\xB1* \xC0\xD2\xF3\x84\x8B\xDE\xFA\xFA\xFA\xFC\xF0\xC3\xF3\xDAk\xAF\xCD5\xD7\3 \x9C\x8D\x8D\x8Dy\xF5\xD5Wg]33\xF3\xFD\xF7\xDF\xCFs\xCF=7G\x8E \x99#G\x8E,xc \x80\xE5\xE5 B\x98\x99w\xDEyg^z\xE9\xA5ٳg\xCF<\xFC\xF0\xC3\xF3\xC4O\xCC/\xBF\xFC2 \x98>\xF8`\x8E ;6kkks\xF8\xF0\xE1\xB9馛\xBD. \xC0\xD2 \xF0'^~\xF9\xE5\xF9\xF9\xE7\x9F\xE7\xBE\xFB{\xF7.z \x80\xA5'@ \x80\xCC_\xFEȡC\x87\xFE\xF4\xFA\xE6\xE6\xA6y\xF3\xE6͛7o~\x87\xCD\xFC]\xFE\xF2\x90\x95\x95\x95?\xBD~\xA1gy\xF3\xE6͛_\xBEy\x80\xBF\x8B\x9F\xE1 2 \xC8 #@ \x80\x8C 2 \xC8\xFC\xE5s@\xFE\xD7\xDF 7oy\xF3\xE6\xCD/\xDF<\xC0\xDF\xE5\x82\xE7\x80\xDCu\xD7]\xD5. \xC0?\xC4\xF1\xE3\xC7\xBD\xB0C]0@.tp \xB0\xF38\x98\xF8\xF1 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\x8C 2 \xC8 #@ \x80\xCC%\xBA\xE1\xF8\xF1\xE3\xC5 \xC0E`e{{{{\xD1K \xAF` d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d \x90 @F\x80 d\xFE
+o\xF0\x9C\x92\xB6\x96 IEND\xAEB`\x82
\ No newline at end of file
Added: trunk/LayoutTests/platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.txt (0 => 137786)
--- trunk/LayoutTests/platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium-mac/fast/inline/justify-emphasis-inline-box-expected.txt 2012-12-14 23:52:00 UTC (rev 137786)
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x64
+ RenderBlock {HTML} at (0,0) size 800x64
+ RenderBody {BODY} at (8,8) size 784x48
+ RenderBlock {DIV} at (0,0) size 200x48
+ RenderBlock {SPAN} at (0,21) size 0x0
+ RenderText {#text} at (0,8) size 512x40
+ text run at (0,8) width 200: "\x{3042}"
+ text run at (0,32) width 512: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
Added: trunk/LayoutTests/platform/mac/fast/inline/justify-emphasis-inline-box-expected.txt (0 => 137786)
--- trunk/LayoutTests/platform/mac/fast/inline/justify-emphasis-inline-box-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/inline/justify-emphasis-inline-box-expected.txt 2012-12-14 23:52:00 UTC (rev 137786)
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x64
+ RenderBlock {HTML} at (0,0) size 800x64
+ RenderBody {BODY} at (8,8) size 784x48
+ RenderBlock {DIV} at (0,0) size 200x48
+ RenderBlock {SPAN} at (0,21) size 0x0
+ RenderText {#text} at (0,8) size 512x40
+ text run at (0,8) width 200: "\x{3042}"
+ text run at (0,32) width 512: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
Modified: trunk/Source/WebCore/ChangeLog (137785 => 137786)
--- trunk/Source/WebCore/ChangeLog 2012-12-14 23:47:29 UTC (rev 137785)
+++ trunk/Source/WebCore/ChangeLog 2012-12-14 23:52:00 UTC (rev 137786)
@@ -1,3 +1,22 @@
+2012-12-14 Yuki Sekiguchi <yuki.sekigu...@access-company.com>
+
+ Emphasis mark is printed after inline-block with justify
+ https://bugs.webkit.org/show_bug.cgi?id=104631
+
+ Reviewed by Dean Jackson.
+
+ Do not print an emphasis mark after an inline-block when justified.
+
+ If an inline-block is expanded, it has a space appended to it.
+ This space should not have any emphasis marks drawn.
+
+ Test: fast/inline/justify-emphasis-inline-box.html
+
+ * platform/graphics/SimpleFontData.h:
+ (WebCore::SimpleFontData::zeroWidthSpaceGlyph): Add getter method to get zero width space glyph.
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::WidthIterator::advanceInternal): We use zero width space for the extra space not to draw emphasis marks.
+
2012-12-14 Jer Noble <jer.no...@apple.com>
Unreviewed bug fix after r137782.
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (137785 => 137786)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2012-12-14 23:47:29 UTC (rev 137785)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2012-12-14 23:52:00 UTC (rev 137786)
@@ -157,6 +157,7 @@
Glyph spaceGlyph() const { return m_spaceGlyph; }
void setSpaceGlyph(Glyph spaceGlyph) { m_spaceGlyph = spaceGlyph; }
+ Glyph zeroWidthSpaceGlyph() const { return m_zeroWidthSpaceGlyph; }
void setZeroWidthSpaceGlyph(Glyph spaceGlyph) { m_zeroWidthSpaceGlyph = spaceGlyph; }
bool isZeroWidthSpaceGlyph(Glyph glyph) const { return glyph == m_zeroWidthSpaceGlyph && glyph; }
Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (137785 => 137786)
--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2012-12-14 23:47:29 UTC (rev 137785)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2012-12-14 23:52:00 UTC (rev 137786)
@@ -223,9 +223,12 @@
float expansionAtThisOpportunity = !m_run.applyWordRounding() ? m_expansionPerOpportunity : roundf(previousExpansion) - roundf(m_expansion);
m_runWidthSoFar += expansionAtThisOpportunity;
if (glyphBuffer) {
- if (glyphBuffer->isEmpty())
- glyphBuffer->add(fontData->spaceGlyph(), fontData, expansionAtThisOpportunity);
- else
+ if (glyphBuffer->isEmpty()) {
+ if (m_forTextEmphasis)
+ glyphBuffer->add(fontData->zeroWidthSpaceGlyph(), fontData, m_expansionPerOpportunity);
+ else
+ glyphBuffer->add(fontData->spaceGlyph(), fontData, expansionAtThisOpportunity);
+ } else
glyphBuffer->expandLastAdvance(expansionAtThisOpportunity);
}
previousExpansion = m_expansion;
