Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (211158 => 211159)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-25 20:42:10 UTC (rev 211159)
@@ -1,3 +1,10 @@
+2017-01-25 Dean Jackson <[email protected]>
+
+ Disable Variation fonts on this branch.
+ <rdar://problem/30085249>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-01-24 Matthew Hanson <[email protected]>
Merge r211070. rdar://problem/30121809
Modified: branches/safari-603-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (211158 => 211159)
--- branches/safari-603-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-01-25 20:42:10 UTC (rev 211159)
@@ -205,7 +205,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS[sdk=embedded*] = ;
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
@@ -212,7 +212,7 @@
ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
+ENABLE_VARIATION_FONTS[sdk=macosx*] = ;
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211158 => 211159)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-25 20:42:10 UTC (rev 211159)
@@ -1,3 +1,10 @@
+2017-01-25 Dean Jackson <[email protected]>
+
+ Disable Variation fonts on this branch.
+ <rdar://problem/30085249>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-01-25 Matthew Hanson <[email protected]>
Merge r211114. rdar://problem/29857388
Modified: branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (211158 => 211159)
--- branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-01-25 20:42:10 UTC (rev 211159)
@@ -205,7 +205,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS[sdk=embedded*] = ;
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
@@ -212,7 +212,7 @@
ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
+ENABLE_VARIATION_FONTS[sdk=macosx*] = ;
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (211158 => 211159)
--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-25 20:42:10 UTC (rev 211159)
@@ -1,3 +1,10 @@
+2017-01-25 Dean Jackson <[email protected]>
+
+ Disable Variation fonts on this branch.
+ <rdar://problem/30085249>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-01-20 Matthew Hanson <[email protected]>
Merge r210949. rdar://problem/30108531
Modified: branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (211158 => 211159)
--- branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-01-25 20:42:10 UTC (rev 211159)
@@ -205,7 +205,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS[sdk=embedded*] = ;
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
@@ -212,7 +212,7 @@
ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
+ENABLE_VARIATION_FONTS[sdk=macosx*] = ;
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211158 => 211159)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-25 20:42:10 UTC (rev 211159)
@@ -1,3 +1,10 @@
+2017-01-25 Dean Jackson <[email protected]>
+
+ Disable Variation fonts on this branch.
+ <rdar://problem/30085249>
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-01-25 Matthew Hanson <[email protected]>
Merge r211052. rdar://problem/29857388
Modified: branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (211158 => 211159)
--- branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-01-25 20:42:10 UTC (rev 211159)
@@ -205,7 +205,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS[sdk=embedded*] = ;
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
@@ -212,7 +212,7 @@
ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
+ENABLE_VARIATION_FONTS[sdk=macosx*] = ;
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
Modified: branches/safari-603-branch/Tools/ChangeLog (211158 => 211159)
--- branches/safari-603-branch/Tools/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-01-25 20:42:10 UTC (rev 211159)
@@ -1,3 +1,10 @@
+2017-01-25 Dean Jackson <[email protected]>
+
+ Disable Variation fonts on this branch.
+ <rdar://problem/30085249>
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-01-24 Matthew Hanson <[email protected]>
Merge r211086. rdar://problem/29948645
Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (211158 => 211159)
--- branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-01-25 20:16:17 UTC (rev 211158)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-01-25 20:42:10 UTC (rev 211159)
@@ -205,7 +205,7 @@
ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
-ENABLE_VARIATION_FONTS[sdk=embedded*] = $(ENABLE_VARIATION_FONTS_$(PLATFORM_NAME));
+ENABLE_VARIATION_FONTS[sdk=embedded*] = ;
ENABLE_VARIATION_FONTS_iphoneos = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_iphonesimulator = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS[sdk=iphoneos9*] = ;
@@ -212,7 +212,7 @@
ENABLE_VARIATION_FONTS[sdk=iphonesimulator9*] = ;
DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
-ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
+ENABLE_VARIATION_FONTS[sdk=macosx*] = ;
ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
ENABLE_VARIATION_FONTS_IF_NOT_YES = ;