<!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>[183653] 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/183653">183653</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-04-30 16:26:11 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>-apple-system-font-monospaced-numbers doesn't work on iOS
https://bugs.webkit.org/show_bug.cgi?id=144478
<rdar://problem/20544940>
Reviewed by Brent Fulgham.
Source/WebCore:
Make sure to start from the system font descriptor when
asking for a monospaced numeric alternate.
Test: platform/ios-simulator/fast/text/system-monospaced-numbers.html
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::createCTFontWithFamilyNameAndWeight):
LayoutTests:
A test that draws two lines of different numbers and checks
they are the same width.
* platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt: Added.
* platform/ios-simulator/fast/text/system-monospaced-numbers.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttextsystemmonospacednumbersexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttextsystemmonospacednumbershtml">trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183652 => 183653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-30 23:16:22 UTC (rev 183652)
+++ trunk/LayoutTests/ChangeLog 2015-04-30 23:26:11 UTC (rev 183653)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-30 Dean Jackson <dino@apple.com>
+
+ -apple-system-font-monospaced-numbers doesn't work on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=144478
+ <rdar://problem/20544940>
+
+ Reviewed by Brent Fulgham.
+
+ A test that draws two lines of different numbers and checks
+ they are the same width.
+
+ * platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt: Added.
+ * platform/ios-simulator/fast/text/system-monospaced-numbers.html: Added.
+
</ins><span class="cx"> 2015-04-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, ios-simulator gardening
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttextsystemmonospacednumbersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt (0 => 183653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt 2015-04-30 23:26:11 UTC (rev 183653)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+These next two lines should be the same width
+
+00:11:22.33
+
+11:11:11.11
+
+PASS: widths were the same
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttextsystemmonospacednumbershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html (0 => 183653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html 2015-04-30 23:26:11 UTC (rev 183653)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<style>
+span {
+ font-family: -apple-system-font-monospaced-numbers;
+ font-size: 24px
+}
+</style>
+<script>
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+window.addEventListener("load", run, false);
+
+function run() {
+ var a = document.getElementById("a");
+ var b = document.getElementById("b");
+ var result = document.getElementById("result");
+
+ var aRect = a.getBoundingClientRect();
+ var bRect = b.getBoundingClientRect();
+
+ if (aRect.width == bRect.width)
+ result.textContent = "PASS: widths were the same";
+ else
+ result.textContent = "FAIL: widths were not the same";
+}
+</script>
+<p>These next two lines should be the same width</p>
+<p><span id="a">00:11:22.33</span></p>
+<p><span id="b">11:11:11.11</span></p>
+
+<p id="result"></p>
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183652 => 183653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-30 23:16:22 UTC (rev 183652)
+++ trunk/Source/WebCore/ChangeLog 2015-04-30 23:26:11 UTC (rev 183653)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-30 Dean Jackson <dino@apple.com>
+
+ -apple-system-font-monospaced-numbers doesn't work on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=144478
+ <rdar://problem/20544940>
+
+ Reviewed by Brent Fulgham.
+
+ Make sure to start from the system font descriptor when
+ asking for a monospaced numeric alternate.
+
+ Test: platform/ios-simulator/fast/text/system-monospaced-numbers.html
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::createCTFontWithFamilyNameAndWeight):
+
</ins><span class="cx"> 2015-04-30 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> DOM bindings should not be using a reference type to point to a temporary object
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (183652 => 183653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-04-30 23:16:22 UTC (rev 183652)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-04-30 23:26:11 UTC (rev 183653)
</span><span class="lines">@@ -625,11 +625,9 @@
</span><span class="cx">
</span><span class="cx"> static NeverDestroyed<AtomicString> systemUIMonospacedNumbersFontWithApplePrefix("-apple-system-font-monospaced-numbers", AtomicString::ConstructFromLiteral);
</span><span class="cx"> if (equalIgnoringCase(familyName, systemUIMonospacedNumbersFontWithApplePrefix)) {
</span><del>- NSDictionary *attributes = @{ (NSString *)kCTFontFeatureTypeIdentifierKey : @(kNumberSpacingType),
- (NSString *)kCTFontFeatureSelectorIdentifierKey : @(kMonospacedNumbersSelector) };
-
- RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontDescriptorCreateWithAttributesAndOptions((CFDictionaryRef)attributes, kCTFontDescriptorOptionSystemUIFont | kCTFontDescriptorOptionPreferAppleSystemFont));
- return CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr);
</del><ins>+ RetainPtr<CTFontDescriptorRef> systemFontDescriptor = adoptCF(CTFontDescriptorCreateForUIType(kCTFontUIFontSystem, size, nullptr));
+ RetainPtr<CTFontDescriptorRef> monospaceFontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithFeature(systemFontDescriptor.get(), (CFNumberRef)@(kNumberSpacingType), (CFNumberRef)@(kMonospacedNumbersSelector)));
+ return CTFontCreateWithFontDescriptor(monospaceFontDescriptor.get(), size, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>