<!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>[192042] 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/192042">192042</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-11-04 16:26:26 -0800 (Wed, 04 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ruby base ending in tatechuyoko forces a line break before the tatechuyoko
https://bugs.webkit.org/show_bug.cgi?id=150883
Reviewed by Darin Adler.
Source/WebCore:
Asking the width of a 0-length tatechuyoko should return 0.
Test: fast/text/ruby-tatechuyoko.html
* rendering/RenderCombineText.cpp:
(WebCore::RenderCombineText::width):
LayoutTests:
* platform/mac/fast/text/international/text-combine-image-test-expected.txt: Updated.
* platform/mac/fast/text/tatechuyoko-expected.txt: Ditto.
* fast/text/ruby-tatechuyoko-expected.html: Added.
* fast/text/ruby-tatechuyoko.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextinternationaltextcombineimagetestexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexttatechuyokoexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/tatechuyoko-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfasttextinternationaltextcombineimagetestexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/fast/text/international/text-combine-image-test-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfasttexttatechuyokoexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/fast/text/tatechuyoko-expected.txt</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="#trunkLayoutTestsfasttextrubytatechuyokoexpectedhtml">trunk/LayoutTests/fast/text/ruby-tatechuyoko-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextrubytatechuyokohtml">trunk/LayoutTests/fast/text/ruby-tatechuyoko.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/LayoutTests/ChangeLog 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Ruby base ending in tatechuyoko forces a line break before the tatechuyoko
+ https://bugs.webkit.org/show_bug.cgi?id=150883
+
+ Reviewed by Darin Adler.
+
+ * platform/mac/fast/text/international/text-combine-image-test-expected.txt: Updated.
+ * platform/mac/fast/text/tatechuyoko-expected.txt: Ditto.
+ * fast/text/ruby-tatechuyoko-expected.html: Added.
+ * fast/text/ruby-tatechuyoko.html: Added.
+
</ins><span class="cx"> 2015-11-04 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Updating expectations for fast/forms/HTMLOptionElement_label03.html on win
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextrubytatechuyokoexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/ruby-tatechuyoko-expected.html (0 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/ruby-tatechuyoko-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/ruby-tatechuyoko-expected.html 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div>This test makes sure that a ruby base which ends in tatechuyoko doesn't force a line break before the tatechuyoko. The test passes if there is no horizontal space to the left of the vertical text below.</div>
+<ruby style="-webkit-writing-mode: vertical-rl;">abcdefghijkl<rt style="color: white;">a</rt></ruby>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/text/ruby-tatechuyoko-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsfasttextrubytatechuyokohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/ruby-tatechuyoko.html (0 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/ruby-tatechuyoko.html (rev 0)
+++ trunk/LayoutTests/fast/text/ruby-tatechuyoko.html 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div>This test makes sure that a ruby base which ends in tatechuyoko doesn't force a line break before the tatechuyoko. The test passes if there is no horizontal space to the left of the vertical text below.</div>
+<ruby style="-webkit-writing-mode: vertical-rl;">abcdefghijkl<span style="-webkit-text-combine: horizontal; color: white;">21</span><rt style="color: white;">a</rt></ruby>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/text/ruby-tatechuyoko.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsplatformmacfasttextinternationaltextcombineimagetestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (317,0) size 274x584
</span><span class="cx"> RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock {P} at (34,0) size 240x584
</span><del>- RenderBlock (floating) {SPAN} at (0,320) size 74x264 [border: (1px solid #FF0000)]
</del><ins>+ RenderBlock (floating) {SPAN} at (0,320) size 38x264 [border: (1px solid #FF0000)]
</ins><span class="cx"> RenderText {#text} at (7,1) size 24x118
</span><span class="cx"> text run at (7,1) width 118: "float:right:"
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 24x25
</span><span class="lines">@@ -109,20 +109,20 @@
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 24x25
</span><span class="cx"> RenderCombineText {#text} at (7,166) size 24x25
</span><span class="cx"> text run at (7,166) width 24: "\x{FFFC}"
</span><del>- RenderText {#text} at (43,1) size 24x24
- text run at (43,1) width 24: "\x{6708}"
- RenderInline {SPAN} at (0,0) size 24x24
- RenderCombineText {#text} at (43,25) size 24x24
- text run at (43,25) width 24: "\x{FFFC}"
- RenderText {#text} at (43,49) size 24x24
- text run at (43,49) width 24: "\x{65E5}"
</del><ins>+ RenderText {#text} at (7,190) size 24x25
+ text run at (7,190) width 24: "\x{6708}"
+ RenderInline {SPAN} at (0,0) size 24x25
+ RenderCombineText {#text} at (7,214) size 24x25
+ text run at (7,214) width 24: "\x{FFFC}"
+ RenderText {#text} at (7,238) size 24x25
+ text run at (7,238) width 24: "\x{65E5}"
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 209x576
</span><span class="cx"> RenderText {#text} at (15,0) size 209x576
</span><span class="cx"> text run at (15,0) width 320: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}"
</span><del>- text run at (63,0) width 320: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}"
- text run at (111,0) width 576: "\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}"
- text run at (159,0) width 576: "\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}"
- text run at (207,0) width 320: "\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
</del><ins>+ text run at (63,0) width 576: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}"
+ text run at (111,0) width 576: "\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}"
+ text run at (159,0) width 576: "\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}"
+ text run at (207,0) width 64: "\x{306B}\x{3044}\x{308B}\x{3002}"
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock (anonymous) at (623,0) size 0x584
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexttatechuyokoexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/tatechuyoko-expected.txt (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/tatechuyoko-expected.txt 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/LayoutTests/platform/mac/fast/text/tatechuyoko-expected.txt 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -18,6 +18,6 @@
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 18x16
</span><span class="cx"> RenderCombineText {#text} at (2,256) size 18x16
</span><span class="cx"> text run at (2,256) width 16: "\x{FFFC}"
</span><del>- RenderText {#text} at (2,272) size 40x560
- text run at (2,272) width 288: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}"
- text run at (24,0) width 304: "\x{7136}\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}"
</del><ins>+ RenderText {#text} at (2,272) size 40x576
+ text run at (2,272) width 304: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}\x{7136}"
+ text run at (24,0) width 288: "\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfasttextinternationaltextcombineimagetestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/fast/text/international/text-combine-image-test-expected.txt (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/text/international/text-combine-image-test-expected.txt 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/text/international/text-combine-image-test-expected.txt 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (320,0) size 274x584
</span><span class="cx"> RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock {P} at (34,0) size 240x584
</span><del>- RenderBlock (floating) {SPAN} at (0,320) size 74x264 [border: (1px solid #FF0000)]
</del><ins>+ RenderBlock (floating) {SPAN} at (0,320) size 38x264 [border: (1px solid #FF0000)]
</ins><span class="cx"> RenderText {#text} at (7,1) size 24x118
</span><span class="cx"> text run at (7,1) width 118: "float:right:"
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 24x25
</span><span class="lines">@@ -109,20 +109,20 @@
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 24x25
</span><span class="cx"> RenderCombineText {#text} at (7,166) size 24x25
</span><span class="cx"> text run at (7,166) width 24: "\x{FFFC}"
</span><del>- RenderText {#text} at (43,1) size 24x24
- text run at (43,1) width 24: "\x{6708}"
- RenderInline {SPAN} at (0,0) size 24x24
- RenderCombineText {#text} at (43,25) size 24x24
- text run at (43,25) width 24: "\x{FFFC}"
- RenderText {#text} at (43,49) size 24x24
- text run at (43,49) width 24: "\x{65E5}"
</del><ins>+ RenderText {#text} at (7,190) size 24x25
+ text run at (7,190) width 24: "\x{6708}"
+ RenderInline {SPAN} at (0,0) size 24x25
+ RenderCombineText {#text} at (7,214) size 24x25
+ text run at (7,214) width 24: "\x{FFFC}"
+ RenderText {#text} at (7,238) size 24x25
+ text run at (7,238) width 24: "\x{65E5}"
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 209x576
</span><span class="cx"> RenderText {#text} at (15,0) size 209x576
</span><span class="cx"> text run at (15,0) width 320: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}"
</span><del>- text run at (63,0) width 320: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}"
- text run at (111,0) width 576: "\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}"
- text run at (159,0) width 576: "\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}"
- text run at (207,0) width 320: "\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
</del><ins>+ text run at (63,0) width 576: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}"
+ text run at (111,0) width 576: "\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}"
+ text run at (159,0) width 576: "\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}"
+ text run at (207,0) width 64: "\x{306B}\x{3044}\x{308B}\x{3002}"
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock (anonymous) at (626,0) size 0x584
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfasttexttatechuyokoexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/fast/text/tatechuyoko-expected.txt (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/text/tatechuyoko-expected.txt 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/text/tatechuyoko-expected.txt 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -18,6 +18,6 @@
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 18x16
</span><span class="cx"> RenderCombineText {#text} at (3,256) size 18x16
</span><span class="cx"> text run at (3,256) width 16: "\x{FFFC}"
</span><del>- RenderText {#text} at (3,272) size 42x560
- text run at (3,272) width 288: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}"
- text run at (27,0) width 304: "\x{7136}\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}"
</del><ins>+ RenderText {#text} at (3,272) size 42x576
+ text run at (3,272) width 304: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}\x{7136}"
+ text run at (27,0) width 288: "\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}"
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/Source/WebCore/ChangeLog 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Ruby base ending in tatechuyoko forces a line break before the tatechuyoko
+ https://bugs.webkit.org/show_bug.cgi?id=150883
+
+ Reviewed by Darin Adler.
+
+ Asking the width of a 0-length tatechuyoko should return 0.
+
+ Test: fast/text/ruby-tatechuyoko.html
+
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::width):
+
</ins><span class="cx"> 2015-11-04 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Update the name of a Mail class that we hardcode
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (192041 => 192042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCombineText.cpp 2015-11-05 00:01:43 UTC (rev 192041)
+++ trunk/Source/WebCore/rendering/RenderCombineText.cpp 2015-11-05 00:26:26 UTC (rev 192042)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> float RenderCombineText::width(unsigned from, unsigned length, const FontCascade& font, float xPosition, HashSet<const Font*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
</span><span class="cx"> {
</span><span class="cx"> if (m_isCombined)
</span><del>- return font.size();
</del><ins>+ return !length ? 0 : font.size();
</ins><span class="cx">
</span><span class="cx"> return RenderText::width(from, length, font, xPosition, fallbackFonts, glyphOverflow);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>