<!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>[170596] trunk/Tools</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/170596">170596</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-06-30 13:57:18 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DRT in iOS sim crashes while loading fonts
https://bugs.webkit.org/show_bug.cgi?id=134451
Reviewed by Geoffrey Garen.
The magic linker symbols had the same name, and were therefore being unified
to a single font file. Then, adding the same file twice was failing.
* DumpRenderTree/mac/DumpRenderTree.mm:
(activateFontsIOS):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170595 => 170596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-30 19:01:49 UTC (rev 170595)
+++ trunk/Tools/ChangeLog 2014-06-30 20:57:18 UTC (rev 170596)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-30 Myles C. Maxfield <mmaxfield@apple.com>
+
+ DRT in iOS sim crashes while loading fonts
+ https://bugs.webkit.org/show_bug.cgi?id=134451
+
+ Reviewed by Geoffrey Garen.
+
+ The magic linker symbols had the same name, and were therefore being unified
+ to a single font file. Then, adding the same file twice was failing.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (activateFontsIOS):
+
</ins><span class="cx"> 2014-06-30 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove Qt cruft from webkitpy
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (170595 => 170596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-06-30 19:01:49 UTC (rev 170595)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-06-30 20:57:18 UTC (rev 170596)
</span><span class="lines">@@ -541,20 +541,20 @@
</span><span class="cx"> // __asm() requires a string literal, so we can't do this as either local variables or template parameters.
</span><span class="cx"> #define fontData(sectionName) \
</span><span class="cx"> { \
</span><del>- extern const uint8_t start __asm("section$start$__DATA$" sectionName); \
- extern const uint8_t end __asm("section$end$__DATA$" sectionName); \
- activateFontIOS(&start, &end - &start, sectionName); \
</del><ins>+ extern const uint8_t start##sectionName __asm("section$start$__DATA$" # sectionName); \
+ extern const uint8_t end##sectionName __asm("section$end$__DATA$" # sectionName); \
+ activateFontIOS(&start##sectionName, &end##sectionName - &start##sectionName, #sectionName); \
</ins><span class="cx"> }
</span><del>- fontData("Ahem");
- fontData("WeightWatcher100");
- fontData("WeightWatcher200");
- fontData("WeightWatcher300");
- fontData("WeightWatcher400");
- fontData("WeightWatcher500");
- fontData("WeightWatcher600");
- fontData("WeightWatcher700");
- fontData("WeightWatcher800");
- fontData("WeightWatcher900");
</del><ins>+ fontData(Ahem);
+ fontData(WeightWatcher100);
+ fontData(WeightWatcher200);
+ fontData(WeightWatcher300);
+ fontData(WeightWatcher400);
+ fontData(WeightWatcher500);
+ fontData(WeightWatcher600);
+ fontData(WeightWatcher700);
+ fontData(WeightWatcher800);
+ fontData(WeightWatcher900);
</ins><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>