Title: [193671] branches/safari-601-branch
- Revision
- 193671
- Author
- matthew_han...@apple.com
- Date
- 2015-12-07 16:23:44 -0800 (Mon, 07 Dec 2015)
Log Message
Merge r191251. rdar://problem/23769811
Modified Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193670 => 193671)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 00:23:44 UTC (rev 193671)
@@ -1,3 +1,15 @@
+2015-10-17 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Delete FontPlatformData::allowsLigatures()
+ https://bugs.webkit.org/show_bug.cgi?id=150286
+
+ Reviewed by Dan Bernstein.
+
+ Make sure it's impossible to turn off required ligatures with CSS.
+
+ * fast/text/required-ligatures-expected.html: Added.
+ * fast/text/required-ligatures.html: Added.
+
2015-10-12 Myles C. Maxfield <mmaxfi...@apple.com>
Test font-variant-* and font-feature-settings on Yosemite and Mavericks
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193670 => 193671)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 00:23:44 UTC (rev 193671)
@@ -1,3 +1,25 @@
+2015-10-17 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Delete FontPlatformData::allowsLigatures()
+ https://bugs.webkit.org/show_bug.cgi?id=150286
+
+ Reviewed by Dan Bernstein.
+
+ This function is only used to force ligatures on for complex fonts (where "complex"
+ means "does not support the letter 'a'"). However, ligatures are turned on for all
+ fonts by default, which means that this function is unnecessary.
+
+ Required ligatures, such as those which make these complex scripts legible, are always
+ enabled, no matter what.
+
+ Test: fast/text/required-ligatures.html
+
+ * platform/graphics/FontPlatformData.h:
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::allowsLigatures): Deleted.
+ * platform/graphics/mac/SimpleFontDataCoreText.cpp:
+ (WebCore::Font::getCFStringAttributes):
+
2015-10-12 Myles C. Maxfield <mmaxfi...@apple.com>
Test font-variant-* and font-feature-settings on Yosemite and Mavericks
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h (193670 => 193671)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h 2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h 2015-12-08 00:23:44 UTC (rev 193671)
@@ -115,8 +115,6 @@
static RetainPtr<CFTypeRef> objectForEqualityCheck(CTFontRef);
RetainPtr<CFTypeRef> objectForEqualityCheck() const;
- bool allowsLigatures() const;
-
#if USE(APPKIT)
// FIXME: Remove this when all NSFont usage is removed.
NSFont *nsFont() const { return (NSFont *)m_font.get(); }
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (193670 => 193671)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-12-08 00:23:44 UTC (rev 193671)
@@ -118,15 +118,6 @@
m_ctFont = nullptr;
}
-bool FontPlatformData::allowsLigatures() const
-{
- if (!m_font)
- return false;
-
- RetainPtr<CFCharacterSetRef> characterSet = adoptCF(CTFontCopyCharacterSet(ctFont()));
- return !(characterSet.get() && CFCharacterSetIsCharacterMember(characterSet.get(), 'a'));
-}
-
inline int mapFontWidthVariantToCTFeatureSelector(FontWidthVariant variant)
{
switch(variant) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
