<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149474] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/149474">149474</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2013-05-01 18:48:55 -0700 (Wed, 01 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>text-combine: horizontal does not work properly for some fonts.
https://bugs.webkit.org/show_bug.cgi?id=115503.

Reviewed by Dave Hyatt.

Source/WebCore: 

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:

LayoutTests: 

* 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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCombineTextcpp">trunk/Source/WebCore/rendering/RenderCombineText.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexttextcombinedifferentfontshtml">trunk/LayoutTests/fast/text/text-combine-different-fonts.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexttextcombinedifferentfontsexpectedpng">trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexttextcombinedifferentfontsexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (149473 => 149474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-05-02 01:30:26 UTC (rev 149473)
+++ trunk/LayoutTests/ChangeLog        2013-05-02 01:48:55 UTC (rev 149474)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-05-01  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+        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.
+
</ins><span class="cx"> 2013-05-01  Stephanie Lewis  &lt;slewis@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update Lion results after http://trac.webkit.org/projects/webkit/changeset/149450
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttextcombinedifferentfontshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-combine-different-fonts.html (0 => 149474)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+&lt;html&gt;
+        &lt;head&gt;
+                &lt;title&gt;text-combine demo&lt;/title&gt;
+                &lt;style type=&quot;text/css&quot;&gt;
+.combine {
+        -webkit-text-combine: horizontal;
+}
+
+body {
+        -webkit-writing-mode: vertical-rl;
+}
+                &lt;/style&gt;
+        &lt;/head&gt;
+        &lt;body&gt;
+                &lt;p style=&quot;font-family: Times&quot;&gt;Times: &lt;span class=&quot;combine&quot;&gt;16&lt;/span&gt;&lt;/p&gt;
+                &lt;p style=&quot;font-family: Hiragino Mincho Pro&quot;&gt;Hiragino Mincho Pro: &lt;span class=&quot;combine&quot;&gt;16&lt;/span&gt;&lt;/p&gt;
+                &lt;p style=&quot;font-family: STHeitiSC-Light&quot;&gt;STHeitiSC-Light: &lt;span class=&quot;combine&quot;&gt;16&lt;/span&gt;&lt;/p&gt;
+        &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexttextcombinedifferentfontsexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfasttexttextcombinedifferentfontsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/text-combine-different-fonts-expected.txt (0 => 149474)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+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: &quot;Times: &quot;
+        RenderInline {SPAN} at (0,0) size 18x16
+          RenderCombineText {#text} at (0,47) size 18x16
+            text run at (0,47) width 16: &quot;\x{FFFC}&quot;
+      RenderBlock {P} at (34,0) size 24x584
+        RenderText {#text} at (3,0) size 17x170
+          text run at (3,0) width 170: &quot;Hiragino Mincho Pro: &quot;
+        RenderInline {SPAN} at (0,0) size 17x17
+          RenderCombineText {#text} at (3,169) size 17x17
+            text run at (3,169) width 16: &quot;\x{FFFC}&quot;
+      RenderBlock {P} at (74,0) size 16x584
+        RenderText {#text} at (0,0) size 16x117
+          text run at (0,0) width 117: &quot;STHeitiSC-Light: &quot;
+        RenderInline {SPAN} at (0,0) size 16x16
+          RenderCombineText {#text} at (0,117) size 16x16
+            text run at (0,117) width 16: &quot;\x{FFFC}&quot;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149473 => 149474)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-05-01  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+        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:
+
</ins><span class="cx"> 2013-05-01  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Null check plugInClient earlier in snapshotting path
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (149473 => 149474)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-const float textCombineMargin = 1.1f; // Allow em + 10% margin
</del><ins>+const float textCombineMargin = 1.15f; // Allow em + 15% margin
</ins><span class="cx"> 
</span><span class="cx"> RenderCombineText::RenderCombineText(Node* node, PassRefPtr&lt;StringImpl&gt; string)
</span><span class="cx">      : RenderText(node, string)
</span></span></pre>
</div>
</div>

</body>
</html>