<!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>[188780] branches/safari-601.1.46-branch</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/188780">188780</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-08-21 14:52:01 -0700 (Fri, 21 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187685">r187685</a>. rdar://problem/22375865</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoresvgSVGToOTFFontConversioncpp">branches/safari-601.1.46-branch/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfasttextarabicduplicateglyphfontexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasttextarabicduplicateglyphfonthtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasttextresourcesarabicduplicateglyphfontsvg">branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/arabic-duplicate-glyph-font.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (188779 => 188780)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-08-21 21:49:31 UTC (rev 188779)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-08-21 21:52:01 UTC (rev 188780)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-08-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187685.
+
+ 2015-07-31 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [SVG -> OTF Converter] Crash when converting Arabic fonts
+ https://bugs.webkit.org/show_bug.cgi?id=147510
+
+ Reviewed by Anders Carlsson.
+
+ * fast/text/arabic-duplicate-glyph-font-expected.txt: Added.
+ * fast/text/arabic-duplicate-glyph-font.html: Added.
+ * fast/text/resources/arabic-duplicate-glyph-font.svg: Added.
+
+2015-08-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187564.
</span><span class="cx">
</span><span class="cx"> 2015-07-29 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextarabicduplicateglyphfontexpectedtxtfromrev187685trunkLayoutTestsfasttextarabicduplicateglyphfontexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font-expected.txt (from rev 187685, trunk/LayoutTests/fast/text/arabic-duplicate-glyph-font-expected.txt) (0 => 188780)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font-expected.txt 2015-08-21 21:52:01 UTC (rev 188780)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test makes sure that SVGToOTFFontConverter::compareCodepointsLexicographically() is transitive. The test passes if there is no crash.
+ﻟﻠﻪ
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextarabicduplicateglyphfonthtmlfromrev187685trunkLayoutTestsfasttextarabicduplicateglyphfonthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font.html (from rev 187685, trunk/LayoutTests/fast/text/arabic-duplicate-glyph-font.html) (0 => 188780)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/arabic-duplicate-glyph-font.html 2015-08-21 21:52:01 UTC (rev 188780)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "arabicfont";
+ src: url("resources/arabic-duplicate-glyph-font.svg") format("svg");
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+This test makes sure that SVGToOTFFontConverter::compareCodepointsLexicographically() is transitive. The test passes if there is no crash.
+<div style="font-family: arabicfont;">&#xfedf;&#xfee0;&#xfeea;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextresourcesarabicduplicateglyphfontsvgfromrev187685trunkLayoutTestsfasttextresourcesarabicduplicateglyphfontsvg"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/arabic-duplicate-glyph-font.svg (from rev 187685, trunk/LayoutTests/fast/text/resources/arabic-duplicate-glyph-font.svg) (0 => 188780)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/arabic-duplicate-glyph-font.svg (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/arabic-duplicate-glyph-font.svg 2015-08-21 21:52:01 UTC (rev 188780)
</span><span class="lines">@@ -0,0 +1,90 @@
</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 horiz-adv-x='1024' >
+ <font-face
+ font-family="Font"
+ font-weight="300"
+ font-stretch="normal"
+ units-per-em="2048"
+ ascent="1374"
+ descent="-674"
+ x-height="680"
+ cap-height="956"
+ bbox="-127 -672 1872 1855"
+ underline-thickness="66"
+ underline-position="-147"
+ unicode-range="U+0020-FEFC"
+ />
+<missing-glyph horiz-adv-x="2048" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ <glyph unicode="&#xfedf;&#xfee0;&#xfeea;" horiz-adv-x="1235" arabic-form="isolated" d="M0 0" />
+ </font>
+</defs></svg>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188779 => 188780)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-21 21:49:31 UTC (rev 188779)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-21 21:52:01 UTC (rev 188780)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-08-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187685.
+
+ 2015-07-31 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [SVG -> OTF Converter] Crash when converting Arabic fonts
+ https://bugs.webkit.org/show_bug.cgi?id=147510
+
+ Reviewed by Anders Carlsson.
+
+ SVGToOTFFontConverter::compareCodepointsLexicographically() wasn't transitive.
+
+ Test: fast/text/arabic-duplicate-glyph-font.html
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::compareCodepointsLexicographically):
+
+2015-08-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187564.
</span><span class="cx">
</span><span class="cx"> 2015-07-29 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/SVGToOTFFontConversion.cpp (188779 => 188780)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-08-21 21:49:31 UTC (rev 188779)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-08-21 21:52:01 UTC (rev 188780)
</span><span class="lines">@@ -1312,8 +1312,6 @@
</span><span class="cx"> auto codePoints2 = StringView(data2.codepoints).codePoints();
</span><span class="cx"> auto iterator1 = codePoints1.begin();
</span><span class="cx"> auto iterator2 = codePoints2.begin();
</span><del>- unsigned length1 = data1.codepoints.length();
- unsigned length2 = data2.codepoints.length();
</del><span class="cx"> while (iterator1 != codePoints1.end() && iterator2 != codePoints2.end()) {
</span><span class="cx"> UChar32 codepoint1, codepoint2;
</span><span class="cx"> codepoint1 = *iterator1;
</span><span class="lines">@@ -1328,10 +1326,12 @@
</span><span class="cx"> ++iterator2;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (length1 == length2 && data1.glyphElement
- && equalIgnoringCase(data1.glyphElement->fastGetAttribute(SVGNames::arabic_formAttr), "isolated"))
- return true;
- return length1 < length2;
</del><ins>+ if (iterator1 == codePoints1.end() && iterator2 == codePoints2.end()) {
+ bool firstIsIsolated = data1.glyphElement && equalIgnoringCase(data1.glyphElement->fastGetAttribute(SVGNames::arabic_formAttr), "isolated");
+ bool secondIsIsolated = data2.glyphElement && equalIgnoringCase(data2.glyphElement->fastGetAttribute(SVGNames::arabic_formAttr), "isolated");
+ return firstIsIsolated && !secondIsIsolated;
+ }
+ return iterator1 == codePoints1.end();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void populateEmptyGlyphCharString(Vector<char, 17>& o, unsigned unitsPerEm)
</span></span></pre>
</div>
</div>
</body>
</html>