<!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>[184899] 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/184899">184899</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 00:14:23 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Arabic ligatures are broken in Google Maps
https://bugs.webkit.org/show_bug.cgi?id=145336
<rdar://problem/20689607>
Reviewed by Darin Adler.
Source/WebCore:
When we fall off the end of the font fallback list, we ask the platform for which particular font we should use
to display a particular codepoint. When we do this, we supply the font which is first in the fallback list so
that the platform can try to match it as best it can. However, web fonts' FontPlatformData have a null m_font
property, which means that we were passing nullptr to this platform fallback function.
The solution is something I've wanted to do for a while, which is migrate webfonts from using
CGDataProviderCreateWithCFData() to using CTFontManagerCreateFontDescriptorFromData(). This call creates a
CoreText font for an in-memory buffer (the old call was creating a CoreGraphics front from the same thing).
This means that we can use the FontPlatformData constructor which accepts a CoreText font, thereby making web
fonts not have a null m_font property. Note that not all platforms can use this call, which means that this
new codepath is gated to only certain OSes (which is okay because only certain OSes use the
CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage() call inside FontCache). Because web fonts are the
only user of the constructor which just takes a CG font, we can make the constructor private to the
FontPlatformData class (as soon as all platforms can use this new codepath).
Test: platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html
* platform/graphics/FontPlatformData.h: Make the FontPlatformData constructor which takes a CGFontRef private.
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData): Use the CoreText type instead of the CoreGraphics type.
(WebCore::createFontCustomPlatformData): Migrate to CTFontManagerCreateFontDescriptorFromData().
* platform/graphics/mac/FontCustomPlatformData.h:
(WebCore::FontCustomPlatformData::FontCustomPlatformData): Store a CTFontDescriptorRef instead of a CGFontRef.
LayoutTests:
This patch adds a DRT test to make sure that text gets drawn with the correct font.
It also updates expected results for 4 tests, which I have verified are still correct. However,
because the behavior of Mavericks differs from Yosemite, I copied the old expected results to
platform/mac-mavericks before updating the results in platform/mac.
This patch also moves fast/ruby/ruby-expansion-cjk*.html to platform/mac because they rely on
platform-specific screen-space quantization. This patch also skips these tests on Mavericks
because I can't add platform-specific expected results for reftests.
* platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont-expected.txt:
* platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html:
* platform/mac-mavericks/fast/css/font-face-opentype-expected.txt: Copied from platform/mac.
* platform/mac-mavericks/svg/batik/text/xmlSpace-expected.txt: Ditto.
* platform/mac-mavericks/svg/custom/svg-fonts-fallback-expected.txt: Ditto.
* platform/mac-mavericks/svg/custom/svg-fonts-without-missing-glyph-expected.txt: Ditto.
* platform/mac-mavericks/TestExpectations: Skip fast/ruyb/ruby-expansion-cjk*.html
* platform/mac/fast/css/font-face-opentype-expected.txt: Updated.
* platform/mac/svg/batik/text/xmlSpace-expected.txt: Ditto.
* platform/mac/svg/custom/svg-fonts-fallback-expected.txt: Ditto.
* platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt: Ditto.
* LayoutTests/platform/mac/fast/ruby/resources/green.png: Moved from fast/ruby/resources/green.png
* LayoutTests/platform/mac/fast/ruby/resources/ruby-expansion.svg: Moved from fast/ruby/resources/ruby-expansion.svg
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2-expected.html: Moved from fast/ruby/ruby-expansion-cjk-2-expected.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2.html: Moved from fast/ruby/ruby-expansion-cjk-2.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3-expected.html: Moved from fast/ruby/ruby-expansion-cjk-3-expected.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3.html: Moved from fast/ruby/ruby-expansion-cjk-3.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4-expected.html: Moved from fast/ruby/ruby-expansion-cjk-4-expected.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4.html: Moved from fast/ruby/ruby-expansion-cjk-4.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5-expected.html: Moved from fast/ruby/ruby-expansion-cjk-5-expected.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5.html: Moved from fast/ruby/ruby-expansion-cjk-5.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-expected.html: Moved from fast/ruby/ruby-expansion-cjk-expected.html
* LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk.html: Moved from fast/ruby/ruby-expansion-cjk.html</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssfontfaceopentypeexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgbatiktextxmlSpaceexpectedtxt">trunk/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcustomsvgfontsfallbackexpectedtxt">trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-fallback-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcustomsvgfontswithoutmissingglyphexpectedtxt">trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksTestExpectations">trunk/LayoutTests/platform/mac-mavericks/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttextarabicwithnosupportingwebfontexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttextarabicwithnosupportingwebfonthtml">trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html</a></li>
<li>trunk/LayoutTests/platform/mac/fast/ruby/resources/</li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyresourcesgreenpng">trunk/LayoutTests/platform/mac/fast/ruby/resources/green.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyresourcesrubyexpansionsvg">trunk/LayoutTests/platform/mac/fast/ruby/resources/ruby-expansion.svg</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk2expectedhtml">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk2html">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk3expectedhtml">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk3html">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk4expectedhtml">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk4html">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk5expectedhtml">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk5html">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjkexpectedhtml">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrubyrubyexpansioncjkhtml">trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfastcssfontfaceopentypeexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/fast/css/font-face-opentype-expected.txt</a></li>
<li>trunk/LayoutTests/platform/mac-mavericks/svg/batik/</li>
<li>trunk/LayoutTests/platform/mac-mavericks/svg/batik/text/</li>
<li><a href="#trunkLayoutTestsplatformmacmaverickssvgbatiktextxmlSpaceexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/svg/batik/text/xmlSpace-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmaverickssvgcustomsvgfontsfallbackexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-fallback-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmaverickssvgcustomsvgfontswithoutmissingglyphexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-without-missing-glyph-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/ruby/resources/</li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk2expectedhtml">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk2html">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk3expectedhtml">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk3html">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk4expectedhtml">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk4html">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk5expectedhtml">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjk5html">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjkexpectedhtml">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyexpansioncjkhtml">trunk/LayoutTests/fast/ruby/ruby-expansion-cjk.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/ChangeLog 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-05-27 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Arabic ligatures are broken in Google Maps
+ https://bugs.webkit.org/show_bug.cgi?id=145336
+ <rdar://problem/20689607>
+
+ Reviewed by Darin Adler.
+
+ This patch adds a DRT test to make sure that text gets drawn with the correct font.
+
+ It also updates expected results for 4 tests, which I have verified are still correct. However,
+ because the behavior of Mavericks differs from Yosemite, I copied the old expected results to
+ platform/mac-mavericks before updating the results in platform/mac.
+
+ This patch also moves fast/ruby/ruby-expansion-cjk*.html to platform/mac because they rely on
+ platform-specific screen-space quantization. This patch also skips these tests on Mavericks
+ because I can't add platform-specific expected results for reftests.
+
+ * platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont-expected.txt:
+ * platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html:
+
+ * platform/mac-mavericks/fast/css/font-face-opentype-expected.txt: Copied from platform/mac.
+ * platform/mac-mavericks/svg/batik/text/xmlSpace-expected.txt: Ditto.
+ * platform/mac-mavericks/svg/custom/svg-fonts-fallback-expected.txt: Ditto.
+ * platform/mac-mavericks/svg/custom/svg-fonts-without-missing-glyph-expected.txt: Ditto.
+ * platform/mac-mavericks/TestExpectations: Skip fast/ruyb/ruby-expansion-cjk*.html
+ * platform/mac/fast/css/font-face-opentype-expected.txt: Updated.
+ * platform/mac/svg/batik/text/xmlSpace-expected.txt: Ditto.
+ * platform/mac/svg/custom/svg-fonts-fallback-expected.txt: Ditto.
+ * platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt: Ditto.
+ * LayoutTests/platform/mac/fast/ruby/resources/green.png: Moved from fast/ruby/resources/green.png
+ * LayoutTests/platform/mac/fast/ruby/resources/ruby-expansion.svg: Moved from fast/ruby/resources/ruby-expansion.svg
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2-expected.html: Moved from fast/ruby/ruby-expansion-cjk-2-expected.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2.html: Moved from fast/ruby/ruby-expansion-cjk-2.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3-expected.html: Moved from fast/ruby/ruby-expansion-cjk-3-expected.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3.html: Moved from fast/ruby/ruby-expansion-cjk-3.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4-expected.html: Moved from fast/ruby/ruby-expansion-cjk-4-expected.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4.html: Moved from fast/ruby/ruby-expansion-cjk-4.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5-expected.html: Moved from fast/ruby/ruby-expansion-cjk-5-expected.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5.html: Moved from fast/ruby/ruby-expansion-cjk-5.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-expected.html: Moved from fast/ruby/ruby-expansion-cjk-expected.html
+ * LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk.html: Moved from fast/ruby/ruby-expansion-cjk.html
+
</ins><span class="cx"> 2015-05-26 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> An SVG with no intrinsic size does not draw correct slices when used as a border-image for an HTML element.
</span></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk2expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2-expected.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2-expected.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-<!DOCTYPE html>
-<head>
-</head>
-<body>
-<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 113px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 180px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 360px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 80px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 226px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 220px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 400px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 339px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 80px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 452px; width: 100%;">
-<div style="position: absolute; width: 300px; height: 20px; left: 0px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 300px; height: 20px; right: 00px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 130px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 129px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 62.5px; background: black;"></div>
-</div>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk2html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-<style>
-@font-face {
- font-family: 'Litherum';
- src: url("resources/ruby-expansion.svg#Litherum") format(svg);
-}
-</style>
-</head>
-<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
-<div dir="rtl">&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div dir="rtl">&#x5e2;&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div dir="rtl">&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2;&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div dir="rtl">&#x5e2;&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2;&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div><ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaa</rt></ruby>a<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaa</rt></ruby> aaaaaaaaaaaaaaaaaaaa</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk3expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3-expected.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3-expected.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-<!DOCTYPE html>
-<head>
-</head>
-<body>
-<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 166px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 166px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 113px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 265px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 210px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 80px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 226px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 135px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 80px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 550px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 339px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 166px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 166px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 452px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 135px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 80px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 550px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk3html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-<style>
-@font-face {
- font-family: 'Litherum';
- src: url("resources/ruby-expansion.svg#Litherum") format(svg);
-}
-</style>
-</head>
-<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
-<div dir="rtl"><span style="color: green;">&#x5e2;</span>&#x5e2;<ruby><rb><span style="color: green;">&#x304e;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x5e2;</span>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div dir="rtl"><span style="color: green;">&#x5e2;</span>&#x5e2;<ruby><rb><span style="color: green;">&#x5e2;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x5e2;</span>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div dir="rtl"><span style="color: green;">&#x5e2;</span>&#x5e2;<ruby><rb><span style="color: green;">&#x304e;</span>&#x5e2;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x5e2;</span>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
-<div><span style="color: green;">a</span>a<ruby><rb><span style="color: green;">&#x304e;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">a</span>a aaaaaaaaaaaaaaaaaaaa</div>
-<div><span style="color: green;">a</span>a<ruby><rb><span style="color: green;">a</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">a</span>a aaaaaaaaaaaaaaaaaaaa</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk4expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4-expected.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4-expected.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-<style>
-@font-face {
- font-family: 'Litherum';
- src: url("resources/ruby-expansion.svg#Litherum") format(svg);
-}
-</style>
-</head>
-<body style="text-align: justify; font-size: 40px; margin: 0px; -webkit-font-smoothing: none;">
-<div>e&#x300;a&#x300;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>e&#x300;a&#x300; <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
-<div style="font-family: Litherum;">
-<div style="position: absolute; left: 0px; top: 130px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 166px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 166px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 236px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 21px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 40px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 120px; top: 40px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 193px; top: 40px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 193px; top: 40px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 119px; top: 40px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 40px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 91px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 370px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 100px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 100px; height: 50px; left: 0px; top: 10px; background: rgb(0, 255, 0);"></div>
-<div style="position: absolute; width: 41px; height: 41px; right: 479px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk4html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-<style>
-@font-face {
- font-family: 'Litherum';
- src: url("resources/ruby-expansion.svg#Litherum") format(svg);
-}
-</style>
-</head>
-<body style="text-align: justify; font-size: 40px; margin: 0px; -webkit-font-smoothing: none;">
-<div>&#xe8;&#xe0;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#xe8;&#xe0; <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
-<div style="position: absolute; left: 0px; top: 130px; font-family: Litherum;">
-<div dir="rtl"><span style="color: green;">&#x62a;</span>&#x62a;<ruby><rb><span style="color: green;">&#x304e;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x62a;</span>&#x62a; aaaaaaaaaaaaaaaaaaaa</div>
-<div>a<ruby><rb>&#x304e;<ruby><rb>&#x304e;&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>a <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
-<div><img src="resources/green.png"><ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>a <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk5expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5-expected.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5-expected.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-</head>
-<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
-<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; right: 100px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 480px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 100px; height: 50px; right: 0px; top: 10px; background: rgb(0, 255, 0);"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjk5html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-<style>
-@font-face {
- font-family: 'Litherum';
- src: url("resources/ruby-expansion.svg#Litherum") format(svg);
-}
-</style>
-</head>
-<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
-<div>a<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><img src="resources/green.png"> <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjkexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-expected.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-expected.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-<!DOCTYPE html>
-<head>
-</head>
-<body>
-<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 106px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 153px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 606px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 212px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 153px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 606px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 318px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 80px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-<div style="position: absolute; left: 0px; top: 431px; width: 100%;">
-<div style="position: absolute; width: 400px; height: 20px; left: 70px; top: 0px; background: black;"></div>
-<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 81px; height: 41px; left: 230px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 81px; height: 41px; left: 460px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
-<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 70px; background: black;"></div>
-</div>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyexpansioncjkhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/ruby/ruby-expansion-cjk.html (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-expansion-cjk.html 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/fast/ruby/ruby-expansion-cjk.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8"/>
-<style>
-@font-face {
- font-family: 'Litherum';
- src: url("resources/ruby-expansion.svg#Litherum") format(svg);
-}
-</style>
-</head>
-<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
-<div>&#x304e;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;aaaaaaaaaaaaaaaaaaaa</div>
-<div>&#x304e;<ruby><rb>a&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;aaaaaaaaaaaaaaaaaaaa</div>
-<div>&#x304e;<ruby><rb>&#x304e;a</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;aaaaaaaaaaaaaaaaaaaa</div>
-<div>aa<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>aa aaaaaaaaaaaaaaaaaaaa</div>
-<div>aa<ruby><rb>aa</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>aa a aaaaaaaaaaaaaaaaaaaa</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttextarabicwithnosupportingwebfontexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont-expected.txt (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x202
+ RenderBlock {HTML} at (0,0) size 800x202
+ RenderBody {BODY} at (8,8) size 784x186
+ RenderBlock (anonymous) at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 762x39
+ text run at (0,0) width 762: "This test makes sure that text which is styled with a web font which does not support arabic 1) does not get drawn with"
+ text run at (0,20) width 379: "LastResort, and 2) does not get drawn with .PhoneFallback"
+ RenderBlock {DIV} at (0,40) size 784x146
+ RenderText {#text} at (0,0) size 299x132
+ text run at (0,0) width 299 RTL: "\x{646}\x{647}\x{631} \x{627}\x{644}\x{646}\x{64A}\x{644}"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttextarabicwithnosupportingwebfonthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html dir="ltr" jstcache="0">
+<head>
+<meta charset="utf-8">
+<style>
+@font-face {
+font-family: 'DroidSans';
+font-style: normal;
+font-weight: 400;
+src: url(../../../../fast/writing-mode/resources/DroidSansFallback-reduced.ttf) format('truetype');
+}
+</style>
+</head>
+<body>
+This test makes sure that text which is styled with a web font which does not support arabic 1) does not get drawn with LastResort, and 2) does not get drawn with .PhoneFallback
+<div style="font: 100px DroidSans;">نهر النيل</div>
+</body></html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssfontfaceopentypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> text run at (0,18) width 107: "character below:"
</span><span class="cx"> RenderBlock (anonymous) at (0,204) size 784x18
</span><span class="cx"> RenderInline {SPAN} at (0,0) size 4x16
</span><del>- RenderText {#text} at (0,1) size 4x16
- text run at (0,1) width 4: "'"
</del><ins>+ RenderText {#text} at (0,2) size 4x16
+ text run at (0,2) width 4: "'"
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyresourcesgreenpngfromrev184898trunkLayoutTestsfastrubyresourcesgreenpng"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/resources/green.png (from rev 184898, trunk/LayoutTests/fast/ruby/resources/green.png) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/resources/green.png (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/resources/green.png 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+\x89PNG
+
++IHDRd2\x90\xFB\xEC\xFDPLTE\xFF4^\xC0\xA8IDAT(c`\xA3`h\xBC\xDD\xE3\x90IEND\xAEB`\x82
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyresourcesrubyexpansionsvgfromrev184898trunkLayoutTestsfastrubyresourcesrubyexpansionsvg"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/resources/ruby-expansion.svg (from rev 184898, trunk/LayoutTests/fast/ruby/resources/ruby-expansion.svg) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/resources/ruby-expansion.svg (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/resources/ruby-expansion.svg 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+<font id="Litherum" horiz-adv-x="1024">
+<font-face font-family="Litherum" units-per-em="1024" ascent="1024" descent="0"/>
+<glyph unicode="a" horiz-adv-x="1024" d="M0 0v1024h1024v-1024z"/>
+<glyph unicode="&#x304e;" horiz-adv-x="1024" d="M0 0v1024h1024v-1024z"/>
+<glyph unicode="&#x5e2;" horiz-adv-x="1024" d="M0 0v1024h1024v-1024z"/>
+<glyph unicode="&#x62a;" horiz-adv-x="1024" d="M0 0v1024h1024v-1024z"/>
+</font>
+</defs>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk2expectedhtmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk2expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2-expected.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2-expected.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<head>
+</head>
+<body>
+<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 112px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 180px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 360px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 80px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 224px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 220px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 400px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 336px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 80px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 448px; width: 100%;">
+<div style="position: absolute; width: 300px; height: 20px; left: 0px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 300px; height: 20px; right: 00px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 130px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 129px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 40px; left: 0px; top: 63.5px; background: black;"></div>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk2htmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-2.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-2.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/ruby-expansion.svg#Litherum") format(svg);
+}
+</style>
+</head>
+<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
+<div dir="rtl">&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div dir="rtl">&#x5e2;&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div dir="rtl">&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2;&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div dir="rtl">&#x5e2;&#x5e2;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x5e2;&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div><ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaa</rt></ruby>a<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaa</rt></ruby> aaaaaaaaaaaaaaaaaaaa</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk3expectedhtmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk3expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3-expected.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3-expected.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!DOCTYPE html>
+<head>
+</head>
+<body>
+<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 166px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 166px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 112px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 265px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 210px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 80px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 224px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 135px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 80px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 550px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 336px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 166px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 166px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 448px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 135px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 80px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 550px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk3htmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk3html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-3.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-3.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/ruby-expansion.svg#Litherum") format(svg);
+}
+</style>
+</head>
+<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
+<div dir="rtl"><span style="color: green;">&#x5e2;</span>&#x5e2;<ruby><rb><span style="color: green;">&#x304e;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x5e2;</span>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div dir="rtl"><span style="color: green;">&#x5e2;</span>&#x5e2;<ruby><rb><span style="color: green;">&#x5e2;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x5e2;</span>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div dir="rtl"><span style="color: green;">&#x5e2;</span>&#x5e2;<ruby><rb><span style="color: green;">&#x304e;</span>&#x5e2;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x5e2;</span>&#x5e2; aaaaaaaaaaaaaaaaaaaa</div>
+<div><span style="color: green;">a</span>a<ruby><rb><span style="color: green;">&#x304e;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">a</span>a aaaaaaaaaaaaaaaaaaaa</div>
+<div><span style="color: green;">a</span>a<ruby><rb><span style="color: green;">a</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">a</span>a aaaaaaaaaaaaaaaaaaaa</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk4expectedhtmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk4expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4-expected.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4-expected.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/ruby-expansion.svg#Litherum") format(svg);
+}
+</style>
+</head>
+<body style="text-align: justify; font-size: 40px; margin: 0px; -webkit-font-smoothing: none;">
+<div>e&#x300;a&#x300;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>e&#x300;a&#x300; <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
+<div style="font-family: Litherum;">
+<div style="position: absolute; left: 0px; top: 130px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 40px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 166px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 166px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 40px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: green;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 236px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 21px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 40px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 120px; top: 40px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 193px; top: 40px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 193px; top: 40px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 119px; top: 40px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 40px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 90px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 369px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 100px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 100px; height: 50px; left: 0px; top: 10px; background: rgb(0, 255, 0);"></div>
+<div style="position: absolute; width: 41px; height: 41px; right: 479px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk4htmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk4html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-4.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-4.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/ruby-expansion.svg#Litherum") format(svg);
+}
+</style>
+</head>
+<body style="text-align: justify; font-size: 40px; margin: 0px; -webkit-font-smoothing: none;">
+<div>&#xe8;&#xe0;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#xe8;&#xe0; <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
+<div style="position: absolute; left: 0px; top: 130px; font-family: Litherum;">
+<div dir="rtl"><span style="color: green;">&#x62a;</span>&#x62a;<ruby><rb><span style="color: green;">&#x304e;</span>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><span style="color: green;">&#x62a;</span>&#x62a; aaaaaaaaaaaaaaaaaaaa</div>
+<div>a<ruby><rb>&#x304e;<ruby><rb>&#x304e;&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>a <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
+<div><img src="resources/green.png"><ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>a <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk5expectedhtmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk5expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5-expected.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5-expected.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+</head>
+<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
+<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; right: 100px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 480px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 100px; height: 50px; right: 0px; top: 10px; background: rgb(0, 255, 0);"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjk5htmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjk5html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-5.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-5.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/ruby-expansion.svg#Litherum") format(svg);
+}
+</style>
+</head>
+<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
+<div>a<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby><img src="resources/green.png"> <span style="font-family: Litherum;">aaaaaaaaaaaaaaaaaaaa</span></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjkexpectedhtmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjkexpectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-expected.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk-expected.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk-expected.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<head>
+</head>
+<body>
+<div style="position: absolute; left: 0px; top: 0px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 106px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 153px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 606px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 212px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 199px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 153px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 606px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 63px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 318px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 200px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 41px; height: 41px; left: 380px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 80px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+<div style="position: absolute; left: 0px; top: 430px; width: 100%;">
+<div style="position: absolute; width: 400px; height: 20px; left: 70px; top: 0px; background: black;"></div>
+<div style="position: absolute; width: 81px; height: 41px; left: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 81px; height: 41px; left: 230px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 81px; height: 41px; left: 460px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 40px; height: 41px; right: 0px; top: 19px; background: black;"></div>
+<div style="position: absolute; width: 800px; height: 41px; left: 0px; top: 69px; background: black;"></div>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrubyrubyexpansioncjkhtmlfromrev184898trunkLayoutTestsfastrubyrubyexpansioncjkhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk.html (from rev 184898, trunk/LayoutTests/fast/ruby/ruby-expansion-cjk.html) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/ruby/ruby-expansion-cjk.html 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/ruby-expansion.svg#Litherum") format(svg);
+}
+</style>
+</head>
+<body style="text-align: justify; font: 40px Litherum; margin: 0px; -webkit-font-smoothing: none;">
+<div>&#x304e;<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;aaaaaaaaaaaaaaaaaaaa</div>
+<div>&#x304e;<ruby><rb>a&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;aaaaaaaaaaaaaaaaaaaa</div>
+<div>&#x304e;<ruby><rb>&#x304e;a</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>&#x304e;aaaaaaaaaaaaaaaaaaaa</div>
+<div>aa<ruby><rb>&#x304e;</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>aa aaaaaaaaaaaaaaaaaaaa</div>
+<div>aa<ruby><rb>aa</rb><rt>aaaaaaaaaaaaaaaaaaaa</rt></ruby>aa a aaaaaaaaaaaaaaaaaaaa</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgbatiktextxmlSpaceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -6,23 +6,23 @@
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 191x18
</span><span class="cx"> chunk 1 (middle anchor) text run 1 at (129.84,40.00) startOffset 0 endOffset 26 width 190.32: "Test of xml:space handling"
</span><span class="cx"> RenderSVGContainer {g} at (10,55) size 432x325
</span><del>- RenderSVGText {text} at (10,55) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x25
- chunk 1 text run 1 at (10.00,75.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (35.34,75.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (10,55) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (10.00,75.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (34.52,75.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (120,67) size 82x10 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 82x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,75.00) startOffset 0 endOffset 17 width 81.61: "no xml:space attr"
</span><del>- RenderSVGText {text} at (10,80) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x25
- chunk 1 text run 1 at (10.00,100.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (35.34,100.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (10,80) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (10.00,100.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (34.52,100.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (120,92) size 92x10 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,100.00) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,130) size 99x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 99x25
- chunk 1 text run 1 at (10.00,150.00) startOffset 0 endOffset 8 width 98.68: " X X "
</del><ins>+ RenderSVGText {text} at (10,130) size 98x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 98x25
+ chunk 1 text run 1 at (10.00,150.00) startOffset 0 endOffset 8 width 97.04: " X X "
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGText {text} at (120,132) size 92x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 92x9
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,149.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,155) size 75x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x25
- chunk 1 text run 1 at (10.00,175.00) startOffset 0 endOffset 6 width 74.68: " X X"
</del><ins>+ RenderSVGText {text} at (10,155) size 74x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 74x25
+ chunk 1 text run 1 at (10.00,175.00) startOffset 0 endOffset 6 width 73.04: " X X"
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderSVGText {text} at (120,157) size 92x20 contains 1 chunk(s)
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,174.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,180) size 87x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 87x25
- chunk 1 text run 1 at (10.00,200.00) startOffset 0 endOffset 7 width 86.68: " X X "
</del><ins>+ RenderSVGText {text} at (10,180) size 86x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 86x25
+ chunk 1 text run 1 at (10.00,200.00) startOffset 0 endOffset 7 width 85.04: " X X "
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderSVGText {text} at (120,182) size 92x20 contains 1 chunk(s)
</span><span class="lines">@@ -52,100 +52,100 @@
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,199.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,205) size 87x25 contains 1 chunk(s)
</del><ins>+ RenderSVGText {text} at (10,205) size 86x25 contains 1 chunk(s)
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 0x0
</span><del>- RenderSVGInlineText {#text} at (0,0) size 87x25
- chunk 1 text run 1 at (10.00,225.00) startOffset 0 endOffset 7 width 86.68: " X X "
</del><ins>+ RenderSVGInlineText {#text} at (0,0) size 86x25
+ chunk 1 text run 1 at (10.00,225.00) startOffset 0 endOffset 7 width 85.04: " X X "
</ins><span class="cx"> RenderSVGText {text} at (120,207) size 92x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 58x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,215.00) startOffset 0 endOffset 12 width 57.61: "tspan start "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,224.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,230) size 87x25 contains 1 chunk(s)
</del><ins>+ RenderSVGText {text} at (10,230) size 86x25 contains 1 chunk(s)
</ins><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 12x25
</span><span class="cx"> chunk 1 text run 1 at (10.00,250.00) startOffset 0 endOffset 1 width 12.00: " "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGInlineText {#text} at (-10,-230) size 0x0
</span><del>- RenderSVGInlineText {#text} at (12,0) size 75x25
- chunk 1 text run 1 at (22.00,250.00) startOffset 0 endOffset 6 width 74.68: "X X "
</del><ins>+ RenderSVGInlineText {#text} at (12,0) size 74x25
+ chunk 1 text run 1 at (22.00,250.00) startOffset 0 endOffset 6 width 73.04: "X X "
</ins><span class="cx"> RenderSVGText {text} at (120,232) size 92x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 82x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,240.00) startOffset 0 endOffset 17 width 81.61: "tspan near start "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,249.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,255) size 99x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 38x25
- chunk 1 text run 1 at (10.00,275.00) startOffset 0 endOffset 3 width 37.34: " X"
</del><ins>+ RenderSVGText {text} at (10,255) size 98x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 37x25
+ chunk 1 text run 1 at (10.00,275.00) startOffset 0 endOffset 3 width 36.52: " X"
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 13x25
</span><del>- RenderSVGInlineText {#text} at (37,0) size 12x25
- chunk 1 text run 1 at (47.34,275.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (49,0) size 50x25
- chunk 1 text run 1 at (59.34,275.00) startOffset 0 endOffset 4 width 49.34: " X "
</del><ins>+ RenderSVGInlineText {#text} at (36,0) size 12x25
+ chunk 1 text run 1 at (46.52,275.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (48,0) size 49x25
+ chunk 1 text run 1 at (58.52,275.00) startOffset 0 endOffset 4 width 48.52: " X "
</ins><span class="cx"> RenderSVGText {text} at (120,257) size 92x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,265.00) startOffset 0 endOffset 19 width 91.21: "tspan middle front "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,274.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,280) size 87x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 50x25
- chunk 1 text run 1 at (10.00,300.00) startOffset 0 endOffset 4 width 49.34: " X "
</del><ins>+ RenderSVGText {text} at (10,280) size 86x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 49x25
+ chunk 1 text run 1 at (10.00,300.00) startOffset 0 endOffset 4 width 48.52: " X "
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGInlineText {#text} at (-10,-280) size 0x0
</span><del>- RenderSVGInlineText {#text} at (49,0) size 38x25
- chunk 1 text run 1 at (59.34,300.00) startOffset 0 endOffset 3 width 37.34: "X "
</del><ins>+ RenderSVGInlineText {#text} at (48,0) size 37x25
+ chunk 1 text run 1 at (58.52,300.00) startOffset 0 endOffset 3 width 36.52: "X "
</ins><span class="cx"> RenderSVGText {text} at (120,282) size 92x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 82x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,290.00) startOffset 0 endOffset 17 width 81.61: "tspan middle end "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 92x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,299.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
</span><del>- RenderSVGText {text} at (10,305) size 99x25 contains 1 chunk(s)
</del><ins>+ RenderSVGText {text} at (10,305) size 98x25 contains 1 chunk(s)
</ins><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 12x25
</span><span class="cx"> chunk 1 text run 1 at (10.00,325.00) startOffset 0 endOffset 1 width 12.00: " "
</span><del>- RenderSVGInlineText {#text} at (12,0) size 87x25
- chunk 1 text run 1 at (22.00,325.00) startOffset 0 endOffset 7 width 86.68: " X X "
</del><ins>+ RenderSVGInlineText {#text} at (12,0) size 86x25
+ chunk 1 text run 1 at (22.00,325.00) startOffset 0 endOffset 7 width 85.04: " X X "
</ins><span class="cx"> RenderSVGText {text} at (120,307) size 77x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 77x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,315.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 25x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 25x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,324.60) startOffset 0 endOffset 5 width 24.00: "start"
</span><del>- RenderSVGText {text} at (10,330) size 99x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 50x25
- chunk 1 text run 1 at (10.00,350.00) startOffset 0 endOffset 4 width 49.34: " X "
- RenderSVGInlineText {#text} at (49,0) size 50x25
- chunk 1 text run 1 at (59.34,350.00) startOffset 0 endOffset 4 width 49.34: " X "
</del><ins>+ RenderSVGText {text} at (10,330) size 98x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 49x25
+ chunk 1 text run 1 at (10.00,350.00) startOffset 0 endOffset 4 width 48.52: " X "
+ RenderSVGInlineText {#text} at (48,0) size 49x25
+ chunk 1 text run 1 at (58.52,350.00) startOffset 0 endOffset 4 width 48.52: " X "
</ins><span class="cx"> RenderSVGText {text} at (120,332) size 77x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 77x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,340.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 29x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 29x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,349.60) startOffset 0 endOffset 6 width 28.80: "middle"
</span><del>- RenderSVGText {text} at (10,355) size 99x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 87x25
- chunk 1 text run 1 at (10.00,375.00) startOffset 0 endOffset 7 width 86.68: " X X "
- RenderSVGInlineText {#text} at (86,0) size 12x25
- chunk 1 text run 1 at (96.68,375.00) startOffset 0 endOffset 1 width 12.00: " "
</del><ins>+ RenderSVGText {text} at (10,355) size 98x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 86x25
+ chunk 1 text run 1 at (10.00,375.00) startOffset 0 endOffset 7 width 85.04: " X X "
+ RenderSVGInlineText {#text} at (85,0) size 12x25
+ chunk 1 text run 1 at (95.04,375.00) startOffset 0 endOffset 1 width 12.00: " "
</ins><span class="cx"> RenderSVGText {text} at (120,357) size 77x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 77x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,365.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 15x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 15x9
</span><span class="cx"> chunk 1 text run 1 at (120.00,374.60) startOffset 0 endOffset 3 width 14.40: "end"
</span><del>- RenderSVGText {text} at (235,80) size 99x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 99x25
- chunk 1 text run 1 at (235.00,100.00) startOffset 0 endOffset 8 width 98.68: " X X "
</del><ins>+ RenderSVGText {text} at (235,80) size 98x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 98x25
+ chunk 1 text run 1 at (235.00,100.00) startOffset 0 endOffset 8 width 97.04: " X X "
</ins><span class="cx"> RenderSVGText {text} at (345,92) size 97x10 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,100.00) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,130) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x25
- chunk 1 text run 1 at (235.00,150.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (260.34,150.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (235,130) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (235.00,150.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (259.52,150.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 0x0
</span><span class="cx"> RenderSVGText {text} at (345,132) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 92x9
</span><span class="lines">@@ -153,111 +153,111 @@
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,149.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,155) size 63x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x25
- chunk 1 text run 1 at (235.00,175.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (260.34,175.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (235,155) size 62x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (235.00,175.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (259.52,175.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 25x25
</span><del>- RenderSVGInlineText {#text} at (38,0) size 24x25
- chunk 1 text run 1 at (273.68,175.00) startOffset 0 endOffset 2 width 24.00: " "
</del><ins>+ RenderSVGInlineText {#text} at (37,0) size 24x25
+ chunk 1 text run 1 at (272.04,175.00) startOffset 0 endOffset 2 width 24.00: " "
</ins><span class="cx"> RenderSVGText {text} at (345,157) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 73x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,165.00) startOffset 0 endOffset 15 width 72.01: "tspan end 2spc "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,174.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,180) size 63x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 51x25
- chunk 1 text run 1 at (235.00,200.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (260.34,200.00) startOffset 0 endOffset 2 width 25.34: "X "
</del><ins>+ RenderSVGText {text} at (235,180) size 62x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 50x25
+ chunk 1 text run 1 at (235.00,200.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (259.52,200.00) startOffset 0 endOffset 2 width 24.52: "X "
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 13x25
</span><del>- RenderSVGInlineText {#text} at (50,0) size 12x25
- chunk 1 text run 1 at (285.68,200.00) startOffset 0 endOffset 1 width 12.00: " "
</del><ins>+ RenderSVGInlineText {#text} at (49,0) size 12x25
+ chunk 1 text run 1 at (284.04,200.00) startOffset 0 endOffset 1 width 12.00: " "
</ins><span class="cx"> RenderSVGText {text} at (345,182) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 49x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,190.00) startOffset 0 endOffset 10 width 48.01: "tspan end "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,199.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,205) size 51x25 contains 1 chunk(s)
</del><ins>+ RenderSVGText {text} at (235,205) size 50x25 contains 1 chunk(s)
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 12x25
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 12x25
</span><span class="cx"> chunk 1 text run 1 at (235.00,225.00) startOffset 0 endOffset 1 width 12.00: " "
</span><del>- RenderSVGInlineText {#text} at (12,0) size 39x25
- chunk 1 text run 1 at (247.00,225.00) startOffset 1 endOffset 3 width 25.34: "X "
- chunk 1 text run 1 at (272.34,225.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGInlineText {#text} at (12,0) size 38x25
+ chunk 1 text run 1 at (247.00,225.00) startOffset 1 endOffset 3 width 24.52: "X "
+ chunk 1 text run 1 at (271.52,225.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (345,207) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 58x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,215.00) startOffset 0 endOffset 12 width 57.61: "tspan start "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,224.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,230) size 51x25 contains 1 chunk(s)
</del><ins>+ RenderSVGText {text} at (235,230) size 50x25 contains 1 chunk(s)
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 12x25
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 12x25
</span><span class="cx"> chunk 1 text run 1 at (235.00,250.00) startOffset 0 endOffset 1 width 12.00: " "
</span><del>- RenderSVGInlineText {#text} at (12,0) size 39x25
- chunk 1 text run 1 at (247.00,250.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (272.34,250.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGInlineText {#text} at (12,0) size 38x25
+ chunk 1 text run 1 at (247.00,250.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (271.52,250.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (345,232) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 82x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,240.00) startOffset 0 endOffset 17 width 81.61: "tspan near start "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,249.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,255) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 14x25
- chunk 1 text run 1 at (235.00,275.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (235,255) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 13x25
+ chunk 1 text run 1 at (235.00,275.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 13x25
</span><del>- RenderSVGInlineText {#text} at (13,0) size 12x25
- chunk 1 text run 1 at (248.34,275.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (25,0) size 14x25
- chunk 1 text run 1 at (260.34,275.00) startOffset 1 endOffset 2 width 13.34: "X"
</del><ins>+ RenderSVGInlineText {#text} at (12,0) size 12x25
+ chunk 1 text run 1 at (247.52,275.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (24,0) size 13x25
+ chunk 1 text run 1 at (259.52,275.00) startOffset 1 endOffset 2 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (345,257) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 92x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,265.00) startOffset 0 endOffset 19 width 91.21: "tspan middle front "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,274.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,280) size 51x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 26x25
- chunk 1 text run 1 at (235.00,300.00) startOffset 0 endOffset 2 width 25.34: "X "
</del><ins>+ RenderSVGText {text} at (235,280) size 50x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x25
+ chunk 1 text run 1 at (235.00,300.00) startOffset 0 endOffset 2 width 24.52: "X "
</ins><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 13x25
</span><del>- RenderSVGInlineText {#text} at (25,0) size 12x25
- chunk 1 text run 1 at (260.34,300.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (37,0) size 14x25
- chunk 1 text run 1 at (272.34,300.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGInlineText {#text} at (24,0) size 12x25
+ chunk 1 text run 1 at (259.52,300.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (36,0) size 13x25
+ chunk 1 text run 1 at (271.52,300.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (345,282) size 97x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 82x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,290.00) startOffset 0 endOffset 17 width 81.61: "tspan middle end "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 97x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 97x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,299.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
</span><del>- RenderSVGText {text} at (235,305) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x25
- chunk 1 text run 1 at (235.00,325.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (260.34,325.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (235,305) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (235.00,325.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (259.52,325.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (345,307) size 77x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 77x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,315.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 25x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 25x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,324.60) startOffset 0 endOffset 5 width 24.00: "start"
</span><del>- RenderSVGText {text} at (235,330) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 26x25
- chunk 1 text run 1 at (235.00,350.00) startOffset 0 endOffset 2 width 25.34: "X "
- RenderSVGInlineText {#text} at (25,0) size 14x25
- chunk 1 text run 1 at (260.34,350.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (235,330) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x25
+ chunk 1 text run 1 at (235.00,350.00) startOffset 0 endOffset 2 width 24.52: "X "
+ RenderSVGInlineText {#text} at (24,0) size 13x25
+ chunk 1 text run 1 at (259.52,350.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGText {text} at (345,332) size 77x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 77x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,340.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
</span><span class="cx"> RenderSVGTSpan {tspan} at (0,0) size 29x10
</span><span class="cx"> RenderSVGInlineText {#text} at (0,9) size 29x9
</span><span class="cx"> chunk 1 text run 1 at (345.00,349.60) startOffset 0 endOffset 6 width 28.80: "middle"
</span><del>- RenderSVGText {text} at (236,355) size 39x25 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x25
- chunk 1 text run 1 at (236.00,375.00) startOffset 0 endOffset 2 width 25.34: "X "
- chunk 1 text run 1 at (261.34,375.00) startOffset 0 endOffset 1 width 13.34: "X"
</del><ins>+ RenderSVGText {text} at (236,355) size 38x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (236.00,375.00) startOffset 0 endOffset 2 width 24.52: "X "
+ chunk 1 text run 1 at (260.52,375.00) startOffset 0 endOffset 1 width 12.52: "X"
</ins><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderSVGText {text} at (345,357) size 77x20 contains 1 chunk(s)
</span><span class="cx"> RenderSVGInlineText {#text} at (0,0) size 77x9
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcustomsvgfontsfallbackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-fallback-expected.txt (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-fallback-expected.txt 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-fallback-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {hr} at (0,108) size 784x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock {p} at (0,126) size 784x56
</span><del>- RenderInline {span} at (0,0) size 91x52
- RenderText {#text} at (0,2) size 91x52
- text run at (0,2) width 91: "a \x{BE2} o"
- RenderBR {br} at (90,30) size 1x18
</del><ins>+ RenderInline {span} at (0,0) size 93x52
+ RenderText {#text} at (0,2) size 93x52
+ text run at (0,2) width 93: "a \x{BE2} o"
+ RenderBR {br} at (92,30) size 1x18
</ins><span class="cx"> RenderBlock {hr} at (0,198) size 784x2 [border: (1px inset #000000)]
</span><span class="cx"> RenderBlock {p} at (0,216) size 784x112
</span><span class="cx"> RenderInline {span} at (0,0) size 93x52
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcustomsvgfontswithoutmissingglyphexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x284
- RenderBlock {html} at (0,0) size 800x284
- RenderBody {body} at (8,21) size 784x247
</del><ins>+layer at (0,0) size 800x288
+ RenderBlock {html} at (0,0) size 800x288
+ RenderBody {body} at (8,21) size 784x251
</ins><span class="cx"> RenderBlock {h1} at (0,0) size 784x37
</span><span class="cx"> RenderText {#text} at (0,0) size 113x37
</span><span class="cx"> text run at (0,0) width 113: "Test for "
</span><span class="lines">@@ -12,18 +12,18 @@
</span><span class="cx"> RenderBlock {p} at (0,58) size 784x19
</span><span class="cx"> RenderText {#text} at (0,0) size 510x18
</span><span class="cx"> text run at (0,0) width 510: "Following text should be rendered as usual. Only \"A\" has a glyph in SVG Font."
</span><del>- RenderBlock {p} at (0,92) size 784x19
- RenderText {#text} at (0,1) size 35x16
- text run at (0,1) width 35: "XXA"
- RenderBlock {p} at (0,126) size 784x19
- RenderText {#text} at (0,1) size 35x16
- text run at (0,1) width 35: "XAX"
- RenderBlock {p} at (0,160) size 784x19
- RenderText {#text} at (0,1) size 35x16
- text run at (0,1) width 35: "AXX"
- RenderBlock {p} at (0,194) size 784x19
- RenderText {#text} at (0,1) size 33x16
- text run at (0,1) width 33: "XXX"
- RenderBlock {p} at (0,228) size 784x19
</del><ins>+ RenderBlock {p} at (0,92) size 784x20
+ RenderText {#text} at (0,2) size 33x16
+ text run at (0,2) width 33: "XXA"
+ RenderBlock {p} at (0,127) size 784x20
+ RenderText {#text} at (0,2) size 33x16
+ text run at (0,2) width 33: "XAX"
+ RenderBlock {p} at (0,162) size 784x20
+ RenderText {#text} at (0,2) size 33x16
+ text run at (0,2) width 33: "AXX"
+ RenderBlock {p} at (0,197) size 784x20
+ RenderText {#text} at (0,2) size 31x16
+ text run at (0,2) width 31: "XXX"
+ RenderBlock {p} at (0,232) size 784x19
</ins><span class="cx"> RenderText {#text} at (0,1) size 39x16
</span><span class="cx"> text run at (0,1) width 39: "AAA"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/TestExpectations (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/TestExpectations 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/LayoutTests/platform/mac-mavericks/TestExpectations 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -11,4 +11,10 @@
</span><span class="cx"> compositing/media-controls-bar-appearance-big.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # No support for non-HLS Media Selection Group
</span><del>-media/accessiblity-describes-video.html [ Skip ]
</del><span class="cx">\ No newline at end of file
</span><ins>+media/accessiblity-describes-video.html [ Skip ]
+
+# Reftests have different expected results in Mavericks and Yosemite
+platform/mac/fast/ruby/ruby-expansion-cjk.html [ Skip ]
+platform/mac/fast/ruby/ruby-expansion-cjk-2.html [ Skip ]
+platform/mac/fast/ruby/ruby-expansion-cjk-3.html [ Skip ]
+platform/mac/fast/ruby/ruby-expansion-cjk-4.html [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfastcssfontfaceopentypeexpectedtxtfromrev184898trunkLayoutTestsplatformmacfastcssfontfaceopentypeexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-mavericks/fast/css/font-face-opentype-expected.txt (from rev 184898, trunk/LayoutTests/platform/mac/fast/css/font-face-opentype-expected.txt) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/css/font-face-opentype-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/css/font-face-opentype-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,42 @@
</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 784x584
+ RenderBlock {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 54x18
+ text run at (0,0) width 54: "Test for "
+ RenderInline {I} at (0,0) size 753x36
+ RenderInline {A} at (0,0) size 312x18 [color=#0000EE]
+ RenderText {#text} at (53,0) size 312x18
+ text run at (53,0) width 312: "https://bugs.webkit.org/show_bug.cgi?id=34735"
+ RenderText {#text} at (364,0) size 753x36
+ text run at (364,0) width 389: " [Chromium] OpenType font with CFF glyphs is not handled"
+ text run at (0,18) width 163: "correctly on Windows XP"
+ RenderText {#text} at (162,18) size 5x18
+ text run at (162,18) width 5: "."
+ RenderBlock {P} at (0,52) size 784x36
+ RenderText {#text} at (0,0) size 784x36
+ text run at (0,0) width 784: "Check if glyphs in Ahem.otf can be rendered correctly. If the test passes, you should see dozens of black square characters"
+ text run at (0,18) width 44: "below:"
+ RenderBlock (anonymous) at (0,104) size 784x32
+ RenderInline {SPAN} at (0,0) size 736x16
+ RenderText {#text} at (0,0) size 736x16
+ text run at (0,0) width 736: "!\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO"
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 736x16
+ RenderText {#text} at (0,16) size 736x16
+ text run at (0,16) width 736: "PQRSTUVWXYZ[\\]^_`abcdefghijklmnoqrstuvwxyz{|}~"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {P} at (0,152) size 784x36
+ RenderText {#text} at (0,0) size 759x36
+ text run at (0,0) width 759: "Check if glyphs not in Ahem.otf can be rendered using a fallback font. If the test passes, you should see a single-quote"
+ text run at (0,18) width 107: "character below:"
+ RenderBlock (anonymous) at (0,204) size 784x18
+ RenderInline {SPAN} at (0,0) size 4x16
+ RenderText {#text} at (0,1) size 4x16
+ text run at (0,1) width 4: "'"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmaverickssvgbatiktextxmlSpaceexpectedtxtfromrev184898trunkLayoutTestsplatformmacsvgbatiktextxmlSpaceexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-mavericks/svg/batik/text/xmlSpace-expected.txt (from rev 184898, trunk/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/svg/batik/text/xmlSpace-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/svg/batik/text/xmlSpace-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,267 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 450x500
+ RenderSVGRoot {svg} at (10,25) size 432x355
+ RenderSVGText {text} at (129,25) size 192x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 191x18
+ chunk 1 (middle anchor) text run 1 at (129.84,40.00) startOffset 0 endOffset 26 width 190.32: "Test of xml:space handling"
+ RenderSVGContainer {g} at (10,55) size 432x325
+ RenderSVGText {text} at (10,55) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 39x25
+ chunk 1 text run 1 at (10.00,75.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (35.34,75.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (120,67) size 82x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x9
+ chunk 1 text run 1 at (120.00,75.00) startOffset 0 endOffset 17 width 81.61: "no xml:space attr"
+ RenderSVGText {text} at (10,80) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 39x25
+ chunk 1 text run 1 at (10.00,100.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (35.34,100.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (120,92) size 92x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 92x9
+ chunk 1 text run 1 at (120.00,100.00) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,130) size 99x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 99x25
+ chunk 1 text run 1 at (10.00,150.00) startOffset 0 endOffset 8 width 98.68: " X X "
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGText {text} at (120,132) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 92x9
+ chunk 1 text run 1 at (120.00,140.00) startOffset 0 endOffset 19 width 91.21: "Empty tspan at end "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,149.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,155) size 75x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x25
+ chunk 1 text run 1 at (10.00,175.00) startOffset 0 endOffset 6 width 74.68: " X X"
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGInlineText {#text} at (0,0) size 0x0
+ RenderSVGText {text} at (120,157) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 73x9
+ chunk 1 text run 1 at (120.00,165.00) startOffset 0 endOffset 15 width 72.01: "tspan end 2spc "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,174.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,180) size 87x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 87x25
+ chunk 1 text run 1 at (10.00,200.00) startOffset 0 endOffset 7 width 86.68: " X X "
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGInlineText {#text} at (0,0) size 0x0
+ RenderSVGText {text} at (120,182) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 49x9
+ chunk 1 text run 1 at (120.00,190.00) startOffset 0 endOffset 10 width 48.01: "tspan end "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,199.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,205) size 87x25 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGInlineText {#text} at (0,0) size 0x0
+ RenderSVGInlineText {#text} at (0,0) size 87x25
+ chunk 1 text run 1 at (10.00,225.00) startOffset 0 endOffset 7 width 86.68: " X X "
+ RenderSVGText {text} at (120,207) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 58x9
+ chunk 1 text run 1 at (120.00,215.00) startOffset 0 endOffset 12 width 57.61: "tspan start "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,224.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,230) size 87x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 12x25
+ chunk 1 text run 1 at (10.00,250.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGInlineText {#text} at (-10,-230) size 0x0
+ RenderSVGInlineText {#text} at (12,0) size 75x25
+ chunk 1 text run 1 at (22.00,250.00) startOffset 0 endOffset 6 width 74.68: "X X "
+ RenderSVGText {text} at (120,232) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x9
+ chunk 1 text run 1 at (120.00,240.00) startOffset 0 endOffset 17 width 81.61: "tspan near start "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,249.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,255) size 99x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 38x25
+ chunk 1 text run 1 at (10.00,275.00) startOffset 0 endOffset 3 width 37.34: " X"
+ RenderSVGTSpan {tspan} at (0,0) size 13x25
+ RenderSVGInlineText {#text} at (37,0) size 12x25
+ chunk 1 text run 1 at (47.34,275.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (49,0) size 50x25
+ chunk 1 text run 1 at (59.34,275.00) startOffset 0 endOffset 4 width 49.34: " X "
+ RenderSVGText {text} at (120,257) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 92x9
+ chunk 1 text run 1 at (120.00,265.00) startOffset 0 endOffset 19 width 91.21: "tspan middle front "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,274.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,280) size 87x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 50x25
+ chunk 1 text run 1 at (10.00,300.00) startOffset 0 endOffset 4 width 49.34: " X "
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGInlineText {#text} at (-10,-280) size 0x0
+ RenderSVGInlineText {#text} at (49,0) size 38x25
+ chunk 1 text run 1 at (59.34,300.00) startOffset 0 endOffset 3 width 37.34: "X "
+ RenderSVGText {text} at (120,282) size 92x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x9
+ chunk 1 text run 1 at (120.00,290.00) startOffset 0 endOffset 17 width 81.61: "tspan middle end "
+ RenderSVGTSpan {tspan} at (0,0) size 92x10
+ RenderSVGInlineText {#text} at (0,9) size 92x9
+ chunk 1 text run 1 at (120.00,299.60) startOffset 0 endOffset 19 width 91.21: "xml:space=\"default\""
+ RenderSVGText {text} at (10,305) size 99x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 12x25
+ chunk 1 text run 1 at (10.00,325.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (12,0) size 87x25
+ chunk 1 text run 1 at (22.00,325.00) startOffset 0 endOffset 7 width 86.68: " X X "
+ RenderSVGText {text} at (120,307) size 77x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x9
+ chunk 1 text run 1 at (120.00,315.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
+ RenderSVGTSpan {tspan} at (0,0) size 25x10
+ RenderSVGInlineText {#text} at (0,9) size 25x9
+ chunk 1 text run 1 at (120.00,324.60) startOffset 0 endOffset 5 width 24.00: "start"
+ RenderSVGText {text} at (10,330) size 99x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 50x25
+ chunk 1 text run 1 at (10.00,350.00) startOffset 0 endOffset 4 width 49.34: " X "
+ RenderSVGInlineText {#text} at (49,0) size 50x25
+ chunk 1 text run 1 at (59.34,350.00) startOffset 0 endOffset 4 width 49.34: " X "
+ RenderSVGText {text} at (120,332) size 77x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x9
+ chunk 1 text run 1 at (120.00,340.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
+ RenderSVGTSpan {tspan} at (0,0) size 29x10
+ RenderSVGInlineText {#text} at (0,9) size 29x9
+ chunk 1 text run 1 at (120.00,349.60) startOffset 0 endOffset 6 width 28.80: "middle"
+ RenderSVGText {text} at (10,355) size 99x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 87x25
+ chunk 1 text run 1 at (10.00,375.00) startOffset 0 endOffset 7 width 86.68: " X X "
+ RenderSVGInlineText {#text} at (86,0) size 12x25
+ chunk 1 text run 1 at (96.68,375.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGText {text} at (120,357) size 77x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x9
+ chunk 1 text run 1 at (120.00,365.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
+ RenderSVGTSpan {tspan} at (0,0) size 15x10
+ RenderSVGInlineText {#text} at (0,9) size 15x9
+ chunk 1 text run 1 at (120.00,374.60) startOffset 0 endOffset 3 width 14.40: "end"
+ RenderSVGText {text} at (235,80) size 99x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 99x25
+ chunk 1 text run 1 at (235.00,100.00) startOffset 0 endOffset 8 width 98.68: " X X "
+ RenderSVGText {text} at (345,92) size 97x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 97x9
+ chunk 1 text run 1 at (345.00,100.00) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,130) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 39x25
+ chunk 1 text run 1 at (235.00,150.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (260.34,150.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGTSpan {tspan} at (0,0) size 0x0
+ RenderSVGText {text} at (345,132) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 92x9
+ chunk 1 text run 1 at (345.00,140.00) startOffset 0 endOffset 19 width 91.21: "Empty tspan at end "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,149.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,155) size 63x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 39x25
+ chunk 1 text run 1 at (235.00,175.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (260.34,175.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGTSpan {tspan} at (0,0) size 25x25
+ RenderSVGInlineText {#text} at (38,0) size 24x25
+ chunk 1 text run 1 at (273.68,175.00) startOffset 0 endOffset 2 width 24.00: " "
+ RenderSVGText {text} at (345,157) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 73x9
+ chunk 1 text run 1 at (345.00,165.00) startOffset 0 endOffset 15 width 72.01: "tspan end 2spc "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,174.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,180) size 63x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 51x25
+ chunk 1 text run 1 at (235.00,200.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (260.34,200.00) startOffset 0 endOffset 2 width 25.34: "X "
+ RenderSVGTSpan {tspan} at (0,0) size 13x25
+ RenderSVGInlineText {#text} at (50,0) size 12x25
+ chunk 1 text run 1 at (285.68,200.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGText {text} at (345,182) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 49x9
+ chunk 1 text run 1 at (345.00,190.00) startOffset 0 endOffset 10 width 48.01: "tspan end "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,199.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,205) size 51x25 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 12x25
+ RenderSVGInlineText {#text} at (0,0) size 12x25
+ chunk 1 text run 1 at (235.00,225.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (12,0) size 39x25
+ chunk 1 text run 1 at (247.00,225.00) startOffset 1 endOffset 3 width 25.34: "X "
+ chunk 1 text run 1 at (272.34,225.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (345,207) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 58x9
+ chunk 1 text run 1 at (345.00,215.00) startOffset 0 endOffset 12 width 57.61: "tspan start "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,224.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,230) size 51x25 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 12x25
+ RenderSVGInlineText {#text} at (0,0) size 12x25
+ chunk 1 text run 1 at (235.00,250.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (12,0) size 39x25
+ chunk 1 text run 1 at (247.00,250.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (272.34,250.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (345,232) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x9
+ chunk 1 text run 1 at (345.00,240.00) startOffset 0 endOffset 17 width 81.61: "tspan near start "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,249.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,255) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 14x25
+ chunk 1 text run 1 at (235.00,275.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGTSpan {tspan} at (0,0) size 13x25
+ RenderSVGInlineText {#text} at (13,0) size 12x25
+ chunk 1 text run 1 at (248.34,275.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (25,0) size 14x25
+ chunk 1 text run 1 at (260.34,275.00) startOffset 1 endOffset 2 width 13.34: "X"
+ RenderSVGText {text} at (345,257) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 92x9
+ chunk 1 text run 1 at (345.00,265.00) startOffset 0 endOffset 19 width 91.21: "tspan middle front "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,274.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,280) size 51x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 26x25
+ chunk 1 text run 1 at (235.00,300.00) startOffset 0 endOffset 2 width 25.34: "X "
+ RenderSVGTSpan {tspan} at (0,0) size 13x25
+ RenderSVGInlineText {#text} at (25,0) size 12x25
+ chunk 1 text run 1 at (260.34,300.00) startOffset 0 endOffset 1 width 12.00: " "
+ RenderSVGInlineText {#text} at (37,0) size 14x25
+ chunk 1 text run 1 at (272.34,300.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (345,282) size 97x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x9
+ chunk 1 text run 1 at (345.00,290.00) startOffset 0 endOffset 17 width 81.61: "tspan middle end "
+ RenderSVGTSpan {tspan} at (0,0) size 97x10
+ RenderSVGInlineText {#text} at (0,9) size 97x9
+ chunk 1 text run 1 at (345.00,299.60) startOffset 0 endOffset 20 width 96.02: "xml:space=\"preserve\""
+ RenderSVGText {text} at (235,305) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 39x25
+ chunk 1 text run 1 at (235.00,325.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (260.34,325.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (345,307) size 77x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x9
+ chunk 1 text run 1 at (345.00,315.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
+ RenderSVGTSpan {tspan} at (0,0) size 25x10
+ RenderSVGInlineText {#text} at (0,9) size 25x9
+ chunk 1 text run 1 at (345.00,324.60) startOffset 0 endOffset 5 width 24.00: "start"
+ RenderSVGText {text} at (235,330) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 26x25
+ chunk 1 text run 1 at (235.00,350.00) startOffset 0 endOffset 2 width 25.34: "X "
+ RenderSVGInlineText {#text} at (25,0) size 14x25
+ chunk 1 text run 1 at (260.34,350.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGText {text} at (345,332) size 77x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x9
+ chunk 1 text run 1 at (345.00,340.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
+ RenderSVGTSpan {tspan} at (0,0) size 29x10
+ RenderSVGInlineText {#text} at (0,9) size 29x9
+ chunk 1 text run 1 at (345.00,349.60) startOffset 0 endOffset 6 width 28.80: "middle"
+ RenderSVGText {text} at (236,355) size 39x25 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 39x25
+ chunk 1 text run 1 at (236.00,375.00) startOffset 0 endOffset 2 width 25.34: "X "
+ chunk 1 text run 1 at (261.34,375.00) startOffset 0 endOffset 1 width 13.34: "X"
+ RenderSVGInlineText {#text} at (0,0) size 0x0
+ RenderSVGText {text} at (345,357) size 77x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x9
+ chunk 1 text run 1 at (345.00,365.00) startOffset 0 endOffset 16 width 76.81: "unknown element "
+ RenderSVGTSpan {tspan} at (0,0) size 15x10
+ RenderSVGInlineText {#text} at (0,9) size 15x9
+ chunk 1 text run 1 at (345.00,374.60) startOffset 0 endOffset 3 width 14.40: "end"
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmaverickssvgcustomsvgfontsfallbackexpectedtxtfromrev184898trunkLayoutTestsplatformmacsvgcustomsvgfontsfallbackexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-fallback-expected.txt (from rev 184898, trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-fallback-expected.txt) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-fallback-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-fallback-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x450
+ RenderBlock {html} at (0,0) size 800x450
+ RenderBody {body} at (8,16) size 784x418
+ RenderBlock {p} at (0,0) size 784x92
+ RenderInline {span} at (0,0) size 87x46
+ RenderText {#text} at (0,0) size 87x46
+ text run at (0,0) width 87: "a \x{BE2} o"
+ RenderBR {br} at (86,22) size 1x18
+ RenderInline {span} at (0,0) size 87x46
+ RenderText {#text} at (0,46) size 87x46
+ text run at (0,46) width 87: "a \x{BE2} o"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {hr} at (0,108) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,126) size 784x56
+ RenderInline {span} at (0,0) size 91x52
+ RenderText {#text} at (0,2) size 91x52
+ text run at (0,2) width 91: "a \x{BE2} o"
+ RenderBR {br} at (90,30) size 1x18
+ RenderBlock {hr} at (0,198) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,216) size 784x112
+ RenderInline {span} at (0,0) size 93x52
+ RenderText {#text} at (0,2) size 93x52
+ text run at (0,2) width 93: "a \x{BE2} o"
+ RenderBR {br} at (92,30) size 1x18
+ RenderInline {span} at (0,0) size 93x52
+ RenderText {#text} at (0,58) size 93x52
+ text run at (0,58) width 93: "a \x{BE2} o"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {hr} at (0,344) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,362) size 784x56
+ RenderInline {span} at (0,0) size 113x52
+ RenderText {#text} at (0,2) size 113x52
+ text run at (0,2) width 113: "a \x{BE2} o"
+ RenderBR {br} at (112,30) size 1x18
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmaverickssvgcustomsvgfontswithoutmissingglyphexpectedtxtfromrev184898trunkLayoutTestsplatformmacsvgcustomsvgfontswithoutmissingglyphexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-without-missing-glyph-expected.txt (from rev 184898, trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-without-missing-glyph-expected.txt) (0 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-without-missing-glyph-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/svg/custom/svg-fonts-without-missing-glyph-expected.txt 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x284
+ RenderBlock {html} at (0,0) size 800x284
+ RenderBody {body} at (8,21) size 784x247
+ RenderBlock {h1} at (0,0) size 784x37
+ RenderText {#text} at (0,0) size 113x37
+ text run at (0,0) width 113: "Test for "
+ RenderInline {a} at (0,0) size 144x37 [color=#0000EE]
+ RenderText {#text} at (112,0) size 144x37
+ text run at (112,0) width 144: "Bug 42352"
+ RenderBlock {p} at (0,58) size 784x19
+ RenderText {#text} at (0,0) size 510x18
+ text run at (0,0) width 510: "Following text should be rendered as usual. Only \"A\" has a glyph in SVG Font."
+ RenderBlock {p} at (0,92) size 784x19
+ RenderText {#text} at (0,1) size 35x16
+ text run at (0,1) width 35: "XXA"
+ RenderBlock {p} at (0,126) size 784x19
+ RenderText {#text} at (0,1) size 35x16
+ text run at (0,1) width 35: "XAX"
+ RenderBlock {p} at (0,160) size 784x19
+ RenderText {#text} at (0,1) size 35x16
+ text run at (0,1) width 35: "AXX"
+ RenderBlock {p} at (0,194) size 784x19
+ RenderText {#text} at (0,1) size 33x16
+ text run at (0,1) width 33: "XXX"
+ RenderBlock {p} at (0,228) size 784x19
+ RenderText {#text} at (0,1) size 39x16
+ text run at (0,1) width 39: "AAA"
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/Source/WebCore/ChangeLog 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-05-27 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Arabic ligatures are broken in Google Maps
+ https://bugs.webkit.org/show_bug.cgi?id=145336
+ <rdar://problem/20689607>
+
+ Reviewed by Darin Adler.
+
+ When we fall off the end of the font fallback list, we ask the platform for which particular font we should use
+ to display a particular codepoint. When we do this, we supply the font which is first in the fallback list so
+ that the platform can try to match it as best it can. However, web fonts' FontPlatformData have a null m_font
+ property, which means that we were passing nullptr to this platform fallback function.
+
+ The solution is something I've wanted to do for a while, which is migrate webfonts from using
+ CGDataProviderCreateWithCFData() to using CTFontManagerCreateFontDescriptorFromData(). This call creates a
+ CoreText font for an in-memory buffer (the old call was creating a CoreGraphics front from the same thing).
+ This means that we can use the FontPlatformData constructor which accepts a CoreText font, thereby making web
+ fonts not have a null m_font property. Note that not all platforms can use this call, which means that this
+ new codepath is gated to only certain OSes (which is okay because only certain OSes use the
+ CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage() call inside FontCache). Because web fonts are the
+ only user of the constructor which just takes a CG font, we can make the constructor private to the
+ FontPlatformData class (as soon as all platforms can use this new codepath).
+
+ Test: platform/ios-simulator/fast/text/arabic-with-no-supporting-webfont.html
+
+ * platform/graphics/FontPlatformData.h: Make the FontPlatformData constructor which takes a CGFontRef private.
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData): Use the CoreText type instead of the CoreGraphics type.
+ (WebCore::createFontCustomPlatformData): Migrate to CTFontManagerCreateFontDescriptorFromData().
+ * platform/graphics/mac/FontCustomPlatformData.h:
+ (WebCore::FontCustomPlatformData::FontCustomPlatformData): Store a CTFontDescriptorRef instead of a CGFontRef.
+
</ins><span class="cx"> 2015-05-26 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> An SVG with no intrinsic size does not draw correct slices when used as a border-image for an HTML element.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "FontPlatformData.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><ins>+#include <CoreText/CoreText.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -33,12 +34,26 @@
</span><span class="cx">
</span><span class="cx"> FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant, FontRenderingMode)
</span><span class="cx"> {
</span><ins>+#if CORETEXT_WEB_FONTS
+ return FontPlatformData(adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr)).get(), size, bold, italic, orientation, widthVariant);
+#else
</ins><span class="cx"> return FontPlatformData(m_cgFont.get(), size, bold, italic, orientation, widthVariant);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> bufferData = buffer.createCFData();
</span><ins>+
+#if CORETEXT_WEB_FONTS
+ RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontManagerCreateFontDescriptorFromData(bufferData.get()));
+ if (!fontDescriptor)
+ return nullptr;
+
+ return std::make_unique<FontCustomPlatformData>(fontDescriptor.get());
+
+#else
+
</ins><span class="cx"> RetainPtr<CGDataProviderRef> dataProvider = adoptCF(CGDataProviderCreateWithCFData(bufferData.get()));
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGFontRef> cgFontRef = adoptCF(CGFontCreateWithDataProvider(dataProvider.get()));
</span><span class="lines">@@ -46,6 +61,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return std::make_unique<FontCustomPlatformData>(cgFontRef.get());
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FontCustomPlatformData::supportsFormat(const String& format)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h (184898 => 184899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2015-05-27 06:41:02 UTC (rev 184898)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2015-05-27 07:14:23 UTC (rev 184899)
</span><span class="lines">@@ -28,7 +28,15 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> typedef struct CGFont* CGFontRef;
</span><ins>+typedef const struct __CTFontDescriptor* CTFontDescriptorRef;
</ins><span class="cx">
</span><ins>+// <rdar://problem/16980736> Web fonts crash on certain OSes when using CTFontManagerCreateFontDescriptorFromData()
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)
+#define CORETEXT_WEB_FONTS 0
+#else
+#define CORETEXT_WEB_FONTS 1
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FontPlatformData;
</span><span class="lines">@@ -37,8 +45,13 @@
</span><span class="cx"> struct FontCustomPlatformData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
</span><span class="cx"> public:
</span><ins>+#if CORETEXT_WEB_FONTS
+ explicit FontCustomPlatformData(CTFontDescriptorRef fontDescriptor)
+ : m_fontDescriptor(fontDescriptor)
+#else
</ins><span class="cx"> explicit FontCustomPlatformData(CGFontRef cgFont)
</span><span class="cx"> : m_cgFont(cgFont)
</span><ins>+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -48,7 +61,11 @@
</span><span class="cx">
</span><span class="cx"> static bool supportsFormat(const String&);
</span><span class="cx">
</span><ins>+#if CORETEXT_WEB_FONTS
+ RetainPtr<CTFontDescriptorRef> m_fontDescriptor;
+#else
</ins><span class="cx"> RetainPtr<CGFontRef> m_cgFont;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer&);
</span></span></pre>
</div>
</div>
</body>
</html>