Unreviewed, rolling out r247462.
https://bugs.webkit.org/show_bug.cgi?id=199816
completely messed up the patch (Requested by litherum on
#webkit).
Reverted changeset:
"New York font erroneously gets synthetic bold"
https://bugs.webkit.org/show_bug.cgi?id=199653
https://trac.webkit.org/changeset/247462
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@247464 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 53b603c..325488b 100644
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,17 @@
+2019-07-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r247462.
+ https://bugs.webkit.org/show_bug.cgi?id=199816
+
+ completely messed up the patch (Requested by litherum on
+ #webkit).
+
+ Reverted changeset:
+
+ "New York font erroneously gets synthetic bold"
+ https://bugs.webkit.org/show_bug.cgi?id=199653
+ https://trac.webkit.org/changeset/247462
+
2019-07-11 Myles C. Maxfield <mmaxfield@apple.com>
New York font erroneously gets synthetic bold
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 6b82053..5237af2 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1598,10 +1598,6 @@
#define HAVE_SUBVIEWS_IVAR_SPI 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110000)
-#define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
-#endif
-
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_DESIGN_SYSTEM_UI_FONTS 1
#endif
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e2a5d1f..e39c4d4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2019-07-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r247462.
+ https://bugs.webkit.org/show_bug.cgi?id=199816
+
+ completely messed up the patch (Requested by litherum on
+ #webkit).
+
+ Reverted changeset:
+
+ "New York font erroneously gets synthetic bold"
+ https://bugs.webkit.org/show_bug.cgi?id=199653
+ https://trac.webkit.org/changeset/247462
+
2019-07-11 Simon Fraser <simon.fraser@apple.com>
Fix builds where HAVE_DESIGN_SYSTEM_UI_FONTS is not defined.
diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursionChecker.cpp b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursionChecker.cpp
index ba497b3..6af88fe 100644
--- a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursionChecker.cpp
+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursionChecker.cpp
@@ -30,7 +30,6 @@
#include "WHLSLCallExpression.h"
#include "WHLSLFunctionDefinition.h"
-#include "WHLSLProgram.h"
#include "WHLSLVisitor.h"
#include <wtf/HashSet.h>
diff --git a/Source/WebCore/page/ProcessWarming.cpp b/Source/WebCore/page/ProcessWarming.cpp
index 26aeac2..a158990 100644
--- a/Source/WebCore/page/ProcessWarming.cpp
+++ b/Source/WebCore/page/ProcessWarming.cpp
@@ -72,7 +72,7 @@
// Prewarms JS VM.
commonVM();
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
// Cache system UI font fallbacks. Almost every web process needs these.
// Initializing one size is sufficient to warm CoreText caches.
FontCascadeDescription systemFontDescription;
diff --git a/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm b/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
index d2121e7..2b8a3dc 100644
--- a/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
+++ b/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
@@ -44,7 +44,7 @@
void platformReleaseMemory(Critical)
{
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
SystemFontDatabaseCoreText::singleton().clear();
#endif
clearFontFamilySpecificationCoreTextCache();
diff --git a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
index 8eb4471..34e5b8fc 100644
--- a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
+++ b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
@@ -62,7 +62,7 @@
{
}
-#if !USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST
unsigned FontCascadeDescription::effectiveFamilyCount() const
{
diff --git a/Source/WebCore/platform/graphics/FontDescription.h b/Source/WebCore/platform/graphics/FontDescription.h
index c8d4a85..21de238 100644
--- a/Source/WebCore/platform/graphics/FontDescription.h
+++ b/Source/WebCore/platform/graphics/FontDescription.h
@@ -31,6 +31,8 @@
#include <unicode/uscript.h>
#include <wtf/MathExtras.h>
+#define USE_PLATFORM_SYSTEM_FALLBACK_LIST ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300))
+
namespace WebCore {
using namespace WebKitFontFamilyNames;
diff --git a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
index 062929c..80c1322 100644
--- a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
+++ b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
@@ -1237,7 +1237,7 @@
return;
}
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
SystemFontDatabaseCoreText::singleton().clear();
#endif
clearFontFamilySpecificationCoreTextCache();
@@ -1393,7 +1393,7 @@
CFIndex coveredLength = 0;
RetainPtr<CTFontRef> result;
-#if !USE(PLATFORM_SYSTEM_FALLBACK_LIST) && (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && TARGET_OS_IOS))
+#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && TARGET_OS_IOS))
result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
#else
result = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
diff --git a/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp b/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
index 95577c2..43e6a93 100644
--- a/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
+++ b/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
@@ -32,7 +32,7 @@
namespace WebCore {
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
#if PLATFORM(IOS_FAMILY)
@@ -121,7 +121,7 @@
FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned index) const
{
// The special cases in this function need to match the behavior in FontCacheIOS.mm and FontCacheMac.mm. On systems
- // where USE(PLATFORM_SYSTEM_FALLBACK_LIST) is set to true, this code is used for regular (element style) lookups,
+ // where USE_PLATFORM_SYSTEM_FALLBACK_LIST is set to true, this code is used for regular (element style) lookups,
// and the code in FontDescriptionCocoa.cpp is used when src:local(special-cased-name) is specified inside an
// @font-face block.
// FIXME: Currently, an @font-face block corresponds to a single item in the font-family: fallback list, which
@@ -144,7 +144,7 @@
return nullAtom();
}
-#endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#endif // USE_PLATFORM_SYSTEM_FALLBACK_LIST
static String computeSpecializedChineseLocale()
{
diff --git a/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
index 1ce0c94..c96a2ed 100644
--- a/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
+++ b/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
@@ -103,7 +103,7 @@
auto font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
auto fontForSynthesisComputation = font;
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
if (auto physicalFont = adoptCF(CTFontCopyPhysicalFont(font.get())))
fontForSynthesisComputation = physicalFont;
#endif
diff --git a/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp
index ac0e34b..3283280 100644
--- a/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp
+++ b/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp
@@ -45,7 +45,7 @@
{
}
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
RetainPtr<CTFontRef> SystemFontDatabaseCoreText::createSystemUIFont(const CascadeListParameters& parameters, CFStringRef locale)
{
@@ -238,7 +238,7 @@
return cascadeList(systemFontParameters(description, cssFamily, clientUse, allowUserInstalledFonts), clientUse);
}
-#endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST)
+#endif // USE_PLATFORM_SYSTEM_FALLBACK_LIST
static String genericFamily(const String& locale, HashMap<String, String>& map, CFStringRef ctKey)
{