Modified: trunk/LayoutTests/ChangeLog (149473 => 149474)
--- trunk/LayoutTests/ChangeLog 2013-05-02 01:30:26 UTC (rev 149473)
+++ trunk/LayoutTests/ChangeLog 2013-05-02 01:48:55 UTC (rev 149474)
@@ -1,3 +1,14 @@
+2013-05-01 Enrica Casucci <[email protected]>
+
+ text-combine: horizontal does not work properly for some fonts.
+ https://bugs.webkit.org/show_bug.cgi?id=115503.
+
+ Reviewed by Dave Hyatt.
+
+ * fast/text/text-combine-different-fonts.html: Added.
+ * platform/mac/fast/text/text-combine-different-fonts-expected.png: Added.
+ * platform/mac/fast/text/text-combine-different-fonts-expected.txt: Added.
+
2013-05-01 Stephanie Lewis <[email protected]>
Update Lion results after http://trac.webkit.org/projects/webkit/changeset/149450
Added: trunk/LayoutTests/fast/text/text-combine-different-fonts.html (0 => 149474)
--- trunk/LayoutTests/fast/text/text-combine-different-fonts.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-combine-different-fonts.html 2013-05-02 01:48:55 UTC (rev 149474)
@@ -0,0 +1,19 @@
+<html>
+ <head>
+ <title>text-combine demo</title>
+ <style type="text/css">
+.combine {
+ -webkit-text-combine: horizontal;
+}
+
+body {
+ -webkit-writing-mode: vertical-rl;
+}
+ </style>
+ </head>
+ <body>
+ <p style="font-family: Times">Times: <span class="combine">16</span></p>
+ <p style="font-family: Hiragino Mincho Pro">Hiragino Mincho Pro: <span class="combine">16</span></p>
+ <p style="font-family: STHeitiSC-Light">STHeitiSC-Light: <span class="combine">16</span></p>
+ </body>
+</html>
Added: trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.txt (0 => 149474)
--- trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.txt 2013-05-02 01:48:55 UTC (rev 149474)
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 776x584
+ RenderBlock {P} at (0,0) size 18x584
+ RenderText {#text} at (0,0) size 18x47
+ text run at (0,0) width 47: "Times: "
+ RenderInline {SPAN} at (0,0) size 18x16
+ RenderCombineText {#text} at (0,47) size 18x16
+ text run at (0,47) width 16: "\x{FFFC}"
+ RenderBlock {P} at (34,0) size 24x584
+ RenderText {#text} at (3,0) size 17x170
+ text run at (3,0) width 170: "Hiragino Mincho Pro: "
+ RenderInline {SPAN} at (0,0) size 17x17
+ RenderCombineText {#text} at (3,169) size 17x17
+ text run at (3,169) width 16: "\x{FFFC}"
+ RenderBlock {P} at (74,0) size 16x584
+ RenderText {#text} at (0,0) size 16x117
+ text run at (0,0) width 117: "STHeitiSC-Light: "
+ RenderInline {SPAN} at (0,0) size 16x16
+ RenderCombineText {#text} at (0,117) size 16x16
+ text run at (0,117) width 16: "\x{FFFC}"
Modified: trunk/Source/WebCore/ChangeLog (149473 => 149474)
--- trunk/Source/WebCore/ChangeLog 2013-05-02 01:30:26 UTC (rev 149473)
+++ trunk/Source/WebCore/ChangeLog 2013-05-02 01:48:55 UTC (rev 149474)
@@ -1,3 +1,19 @@
+2013-05-01 Enrica Casucci <[email protected]>
+
+ text-combine: horizontal does not work properly for some fonts.
+ https://bugs.webkit.org/show_bug.cgi?id=115503.
+
+ Reviewed by Dave Hyatt.
+
+ For some fonts that don't have width variants, we fail to combine glyphs
+ because we believe they don't fit. That decision is made comparing the run width
+ with the font computed size multiplied by a margin factor.
+ I've increased the margin from 10% to 15%.
+
+ Test: fast/text/text-combine-different-fonts.html
+
+ * rendering/RenderCombineText.cpp:
+
2013-05-01 Joseph Pecoraro <[email protected]>
Null check plugInClient earlier in snapshotting path
Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (149473 => 149474)
--- trunk/Source/WebCore/rendering/RenderCombineText.cpp 2013-05-02 01:30:26 UTC (rev 149473)
+++ trunk/Source/WebCore/rendering/RenderCombineText.cpp 2013-05-02 01:48:55 UTC (rev 149474)
@@ -26,7 +26,7 @@
namespace WebCore {
-const float textCombineMargin = 1.1f; // Allow em + 10% margin
+const float textCombineMargin = 1.15f; // Allow em + 15% margin
RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string)
: RenderText(node, string)
