<!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>[190876] 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/190876">190876</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-10-12 12:00:47 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test font-variant-* and font-feature-settings on Yosemite and Mavericks
https://bugs.webkit.org/show_bug.cgi?id=149778
Reviewed by Simon Fraser.
Source/WebCore:
We can simply call the function which enables features on Yosemite and Mavericks.
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::platformFontLookupWithFamily):
(WebCore::fontWithFamily):
LayoutTests:
* platform/mac-wk1/TestExpectations:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3fontfeaturesettingsrenderingexpectedhtml">trunk/LayoutTests/css3/font-feature-settings-rendering-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3fontfeaturesettingsrenderinghtml">trunk/LayoutTests/css3/font-feature-settings-rendering.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/LayoutTests/ChangeLog 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Test font-variant-* and font-feature-settings on Yosemite and Mavericks
+ https://bugs.webkit.org/show_bug.cgi?id=149778
+
+ Reviewed by Simon Fraser.
+
+ * platform/mac-wk1/TestExpectations:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-10-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed test gardening after r190800.
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontfeaturesettingsrenderingexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-feature-settings-rendering-expected.html (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-feature-settings-rendering-expected.html 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/LayoutTests/css3/font-feature-settings-rendering-expected.html 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx"> This tests that font features are able to be turned on and off as desired. It uses a special font
</span><span class="cx"> designed specifically for this purpose. The test passes if you see a sequence of alternating check
</span><span class="cx"> marks and X below.
</span><ins>+<div style="font-family: FontWithFeaturesOTF;">AB</div>
+<div style="font-family: FontWithFeaturesTTF;">AB</div>
</ins><span class="cx"> <div><span style="font-family: FontFeaturesTestOTF;">BA</span>
</span><span class="cx"> <span style="font-family: FontFeaturesTestOTF;">BA</span>
</span><span class="cx"> <span style="font-family: FontFeaturesTestOTF;">BA</span>
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontfeaturesettingsrenderinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-feature-settings-rendering.html (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-feature-settings-rendering.html 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/LayoutTests/css3/font-feature-settings-rendering.html 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx"> This tests that font features are able to be turned on and off as desired. It uses a special font
</span><span class="cx"> designed specifically for this purpose. The test passes if you see a sequence of alternating check
</span><span class="cx"> marks and X below.
</span><ins>+<div style="font-family: FontFeaturesTestOTF;">AB</div>
+<div style="font-family: FontFeaturesTestTTF;">AB</div>
</ins><span class="cx"> <div id="insertionPoint"></div>
</span><span class="cx"> <div id="insertionPoint2"></div>
</span><span class="cx"> <div id="insertionPoint3"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -258,8 +258,9 @@
</span><span class="cx"> # ENABLE(DRAGGABLE_REGION) is disabled
</span><span class="cx"> fast/css/draggable-region-parser.html
</span><span class="cx">
</span><del>-webkit.org/b/149246 [ Mavericks Yosemite ] css3/font-feature-settings-rendering.html [ ImageOnlyFailure ]
-webkit.org/b/149246 [ Mavericks Yosemite ] css3/font-variant-all.html [ ImageOnlyFailure ]
</del><ins>+# Font features are not implemented on Mavericks.
+webkit.org/b/149246 [ Mavericks ] css3/font-feature-settings-rendering.html [ ImageOnlyFailure ]
+webkit.org/b/149246 [ Mavericks ] css3/font-variant-all.html [ ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> # This feature is disabled on Mavericks.
</span><span class="cx"> [ Mavericks ] http/tests/navigation/page-cache-pending-image-load.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -161,4 +161,4 @@
</span><span class="cx"> [ Release ] imported/blink/svg/custom/marker-layout-invalidation.html [ Pass Timeout ]
</span><span class="cx"> [ Release ] imported/blink/fast/css/crash-corner-present.html [ Pass Timeout ]
</span><span class="cx"> [ Release ] imported/blink/compositing/layer-creation/iframe-clip-removed.html [ Pass Timeout ]
</span><del>-[ Debug ] imported/blink/compositing/video/video-controls-layer-creation-squashing.html [ Pass ImageOnlyFailure ]
</del><span class="cx">\ No newline at end of file
</span><ins>+[ Debug ] imported/blink/compositing/video/video-controls-layer-creation-squashing.html [ Pass ImageOnlyFailure ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/Source/WebCore/ChangeLog 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Test font-variant-* and font-feature-settings on Yosemite and Mavericks
+ https://bugs.webkit.org/show_bug.cgi?id=149778
+
+ Reviewed by Simon Fraser.
+
+ We can simply call the function which enables features on Yosemite and Mavericks.
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::platformFontLookupWithFamily):
+ (WebCore::fontWithFamily):
+
</ins><span class="cx"> 2015-10-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't allow plug-ins to override image types for <embed> elements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (190875 => 190876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-10-12 18:45:00 UTC (rev 190875)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-10-12 19:00:47 UTC (rev 190876)
</span><span class="lines">@@ -595,14 +595,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PLATFORM_FONT_LOOKUP)
</span><del>-static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, CTFontSymbolicTraits requestedTraits, FontWeight weight, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, TextRenderingMode textRenderingMode, float size)
</del><ins>+static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, CTFontSymbolicTraits requestedTraits, FontWeight weight, float size)
</ins><span class="cx"> {
</span><span class="cx"> const auto& whitelist = fontWhitelist();
</span><span class="cx"> if (whitelist.size() && !whitelist.contains(family))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto foundFont = adoptCF(CTFontCreateForCSS(family.string().createCFString().get(), toCoreTextFontWeight(weight), requestedTraits, size));
- return preparePlatformFont(foundFont.get(), textRenderingMode, featureSettings, variantSettings);
</del><ins>+ return adoptCF(CTFontCreateForCSS(family.string().createCFString().get(), toCoreTextFontWeight(weight), requestedTraits, size));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -613,12 +612,13 @@
</span><span class="cx"> if (auto specialCase = platformFontWithFamilySpecialCase(family, weight, desiredTraits, size))
</span><span class="cx"> return specialCase;
</span><span class="cx"> #if ENABLE(PLATFORM_FONT_LOOKUP)
</span><del>- return platformFontLookupWithFamily(family, desiredTraits, weight, featureSettings, variantSettings, textRenderingMode, size);
</del><ins>+ RetainPtr<CTFontRef> foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(featureSettings);
</span><span class="cx"> UNUSED_PARAM(variantSettings);
</span><del>- return platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
</del><ins>+ RetainPtr<CTFontRef> foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
</ins><span class="cx"> #endif
</span><ins>+ return preparePlatformFont(foundFont.get(), textRenderingMode, featureSettings, variantSettings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>