Title: [193670] branches/safari-601-branch
- Revision
- 193670
- Author
- matthew_han...@apple.com
- Date
- 2015-12-07 16:23:41 -0800 (Mon, 07 Dec 2015)
Log Message
Merge r190876. rdar://problem/23769786
Modified Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193669 => 193670)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 00:23:41 UTC (rev 193670)
@@ -1,3 +1,13 @@
+2015-10-12 Myles C. Maxfield <mmaxfi...@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:
+
2015-11-03 Ryan Haddad <ryanhad...@apple.com>
Skipping tests added with r191968 on win.
Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html (193669 => 193670)
--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html 2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html 2015-12-08 00:23:41 UTC (rev 193670)
@@ -16,6 +16,8 @@
This tests that font features are able to be turned on and off as desired. It uses a special font
designed specifically for this purpose. The test passes if you see a sequence of alternating check
marks and X below.
+<div style="font-family: FontFeaturesTestOTF;">AB</div>
+<div style="font-family: FontFeaturesTestTTF;">AB</div>
<div id="insertionPoint"></div>
<div id="insertionPoint2"></div>
<div id="insertionPoint3"></div>
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193669 => 193670)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 00:23:41 UTC (rev 193670)
@@ -1,3 +1,16 @@
+2015-10-12 Myles C. Maxfield <mmaxfi...@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):
+
2015-11-12 Csaba Osztrogonác <o...@webkit.org>
Fix build failure due to missing forward declaration of FontVariantSettings after r191968
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193669 => 193670)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-08 00:23:41 UTC (rev 193670)
@@ -380,6 +380,8 @@
return nil;
font = [NSFont fontWithName:chosenFullName size:size];
+ auto foundFont = applyFontFeatureSettings((CTFontRef)font, nullptr, nullptr, featureSettings, variantSettings);
+ font = CFBridgingRelease(CFRetain(foundFont.get()));
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
