Diff
Modified: tags/Safari-604.1.25.3.30/Source/_javascript_Core/ChangeLog (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/_javascript_Core/ChangeLog 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/_javascript_Core/ChangeLog 2017-06-22 07:33:34 UTC (rev 218683)
@@ -1,3 +1,17 @@
+2017-06-22 Babak Shafiei <[email protected]>
+
+ Merge r218620.
+
+ 2017-06-20 Myles C. Maxfield <[email protected]>
+
+ Disable font variations on macOS Sierra and iOS 10
+ https://bugs.webkit.org/show_bug.cgi?id=173618
+ <rdar://problem/32879164>
+
+ Reviewed by Jon Lee.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-06-21 Babak Shafiei <[email protected]>
Roll out r217530.
Modified: tags/Safari-604.1.25.3.30/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-06-22 07:33:34 UTC (rev 218683)
@@ -237,10 +237,10 @@
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphoneos10*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
+DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
Modified: tags/Safari-604.1.25.3.30/Source/WebCore/ChangeLog (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebCore/ChangeLog 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebCore/ChangeLog 2017-06-22 07:33:34 UTC (rev 218683)
@@ -1,3 +1,25 @@
+2017-06-22 Babak Shafiei <[email protected]>
+
+ Merge r218620.
+
+ 2017-06-20 Myles C. Maxfield <[email protected]>
+
+ Disable font variations on macOS Sierra and iOS 10
+ https://bugs.webkit.org/show_bug.cgi?id=173618
+ <rdar://problem/32879164>
+
+ Reviewed by Jon Lee.
+
+ On macOS Sierra and iOS 10, there are some platform problems involved with font variations. They
+ were previously enabled on those OSes just as a preview development tool. These platform bugs have
+ been fixed in macOS High Sierra and iOS 11, so we should align our feature flags with the eventual
+ configurations.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::defaultVariationValues):
+ (WebCore::preparePlatformFont):
+
2017-06-12 Matthew Hanson <[email protected]>
Cherry-pick r218068. rdar://problem/32686871
Modified: tags/Safari-604.1.25.3.30/Source/WebCore/Configurations/FeatureDefines.xcconfig (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-06-22 07:33:34 UTC (rev 218683)
@@ -237,10 +237,10 @@
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphoneos10*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
+DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
Modified: tags/Safari-604.1.25.3.30/Source/WebCore/PAL/ChangeLog (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebCore/PAL/ChangeLog 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebCore/PAL/ChangeLog 2017-06-22 07:33:34 UTC (rev 218683)
@@ -1,3 +1,17 @@
+2017-06-22 Babak Shafiei <[email protected]>
+
+ Merge r218620.
+
+ 2017-06-20 Myles C. Maxfield <[email protected]>
+
+ Disable font variations on macOS Sierra and iOS 10
+ https://bugs.webkit.org/show_bug.cgi?id=173618
+ <rdar://problem/32879164>
+
+ Reviewed by Jon Lee.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-06-08 Dean Jackson <[email protected]>
Disable some features on this release branch.
Modified: tags/Safari-604.1.25.3.30/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-06-22 07:33:34 UTC (rev 218683)
@@ -237,10 +237,10 @@
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphoneos10*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
+DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
Modified: tags/Safari-604.1.25.3.30/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-06-22 07:33:34 UTC (rev 218683)
@@ -398,15 +398,6 @@
CFNumberGetValue(minimumValue, kCFNumberFloatType, &rawMinimumValue);
CFNumberGetValue(maximumValue, kCFNumberFloatType, &rawMaximumValue);
- // FIXME: Remove when <rdar://problem/28893836> is fixed
-#define WORKAROUND_CORETEXT_VARIATIONS_EXTENTS_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
-#if WORKAROUND_CORETEXT_VARIATIONS_EXTENTS_BUG
- float epsilon = 0.001;
- rawMinimumValue += epsilon;
- rawMaximumValue -= epsilon;
-#endif
-#undef WORKAROUND_CORETEXT_VARIATIONS_EXTENTS_BUG
-
if (rawMinimumValue > rawMaximumValue)
std::swap(rawMinimumValue, rawMaximumValue);
@@ -559,18 +550,6 @@
VariationsMap variationsToBeApplied;
bool needsConversion = isGXVariableFont(originalFont);
- auto applyVariationValue = [&](const FontTag& tag, float value, bool isDefaultValue) {
- // FIXME: Remove when <rdar://problem/28707822> is fixed
-#define WORKAROUND_CORETEXT_VARIATIONS_DEFAULT_VALUE_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
-#if WORKAROUND_CORETEXT_VARIATIONS_DEFAULT_VALUE_BUG
- if (isDefaultValue)
- value += 0.0001;
-#else
- UNUSED_PARAM(isDefaultValue);
-#endif
-#undef WORKAROUND_CORETEXT_VARIATIONS_DEFAULT_VALUE_BUG
- variationsToBeApplied.set(tag, value);
- };
auto applyVariation = [&](const FontTag& tag, float value) {
auto iterator = defaultValues.find(tag);
@@ -577,8 +556,7 @@
if (iterator == defaultValues.end())
return;
float valueToApply = clampTo(value, iterator->value.minimumValue, iterator->value.maximumValue);
- bool isDefaultValue = valueToApply == iterator->value.defaultValue;
- applyVariationValue(tag, valueToApply, isDefaultValue);
+ variationsToBeApplied.set(tag, valueToApply);
};
// The system font is somewhat magical. Don't mess with its variations.
@@ -613,17 +591,6 @@
for (auto& newVariation : variations)
applyVariation(newVariation.tag(), newVariation.value());
-#define WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
-#if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
- if (!fontIsSystemFont(originalFont)) {
- for (auto& defaultValue : defaultValues) {
- if (!variationsToBeApplied.contains(defaultValue.key))
- applyVariationValue(defaultValue.key, defaultValue.value.defaultValue, true);
- }
- }
-#endif
-#undef WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
-
#endif // ENABLE(VARIATION_FONTS)
auto attributes = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
Modified: tags/Safari-604.1.25.3.30/Source/WebKit/mac/ChangeLog (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebKit/mac/ChangeLog 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebKit/mac/ChangeLog 2017-06-22 07:33:34 UTC (rev 218683)
@@ -1,3 +1,17 @@
+2017-06-22 Babak Shafiei <[email protected]>
+
+ Merge r218620.
+
+ 2017-06-20 Myles C. Maxfield <[email protected]>
+
+ Disable font variations on macOS Sierra and iOS 10
+ https://bugs.webkit.org/show_bug.cgi?id=173618
+ <rdar://problem/32879164>
+
+ Reviewed by Jon Lee.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-06-08 Dean Jackson <[email protected]>
Disable some features on this release branch.
Modified: tags/Safari-604.1.25.3.30/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-06-22 07:33:34 UTC (rev 218683)
@@ -237,10 +237,10 @@
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphoneos10*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
+DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
Modified: tags/Safari-604.1.25.3.30/Source/WebKit2/ChangeLog (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebKit2/ChangeLog 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebKit2/ChangeLog 2017-06-22 07:33:34 UTC (rev 218683)
@@ -1,3 +1,17 @@
+2017-06-22 Babak Shafiei <[email protected]>
+
+ Merge r218620.
+
+ 2017-06-20 Myles C. Maxfield <[email protected]>
+
+ Disable font variations on macOS Sierra and iOS 10
+ https://bugs.webkit.org/show_bug.cgi?id=173618
+ <rdar://problem/32879164>
+
+ Reviewed by Jon Lee.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-06-13 Matthew Hanson <[email protected]>
Cherry-pick r218121. rdar://problem/32701257
Modified: tags/Safari-604.1.25.3.30/Source/WebKit2/Configurations/FeatureDefines.xcconfig (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-06-22 07:33:34 UTC (rev 218683)
@@ -237,10 +237,10 @@
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphoneos10*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
+DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
Modified: tags/Safari-604.1.25.3.30/Tools/ChangeLog (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Tools/ChangeLog 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Tools/ChangeLog 2017-06-22 07:33:34 UTC (rev 218683)
@@ -1,3 +1,17 @@
+2017-06-22 Babak Shafiei <[email protected]>
+
+ Merge r218620.
+
+ 2017-06-20 Myles C. Maxfield <[email protected]>
+
+ Disable font variations on macOS Sierra and iOS 10
+ https://bugs.webkit.org/show_bug.cgi?id=173618
+ <rdar://problem/32879164>
+
+ Reviewed by Jon Lee.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-06-13 Matthew Hanson <[email protected]>
Cherry-pick r218121. rdar://problem/32701257
Modified: tags/Safari-604.1.25.3.30/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (218682 => 218683)
--- tags/Safari-604.1.25.3.30/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-06-22 07:25:33 UTC (rev 218682)
+++ tags/Safari-604.1.25.3.30/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-06-22 07:33:34 UTC (rev 218683)
@@ -237,10 +237,10 @@
ENABLE_VARIATION_FONTS[sdk=iphone*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
-ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
-ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphoneos10*] = ;
+ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
-DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
+DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1013000);
ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
