Changeset 255219 in webkit

Timestamp:

Jan 27, 2020 6:07:06 PM (4 years ago)

Author:

Jonathan Bedard

Message:

WebCore: Remove iOS 11 macros from RenderThemeIOS.mm
​https://bugs.webkit.org/show_bug.cgi?id=206787

Reviewed by Darin Adler.

Source/WebCore:

No functional changes, covered by existing tests.

• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::cachedSystemFontDescription const):
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription const):

Source/WTF:

• wtf/PlatformHave.h: Add HAVE(SYSTEM_FONT_STYLE_TITLE_0) and HAVE(SYSTEM_FONT_STYLE_TITLE_4).

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderThemeIOS.mm (modified) (6 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-01-27  Jonathan Bedard  <jbedard@apple.com>
+
+        WebCore: Remove iOS 11 macros from RenderThemeIOS.mm
+        https://bugs.webkit.org/show_bug.cgi?id=206787
+
+        Reviewed by Darin Adler.
+
+        * wtf/PlatformHave.h: Add HAVE(SYSTEM_FONT_STYLE_TITLE_0) and HAVE(SYSTEM_FONT_STYLE_TITLE_4).
+
 2020-01-27  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -566 +566 @@
 #define HAVE_OS_SIGNPOST 1
 #endif
+
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#define HAVE_SYSTEM_FONT_STYLE_TITLE_0 1
+#define HAVE_SYSTEM_FONT_STYLE_TITLE_4 1
+#endif

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-27  Jonathan Bedard  <jbedard@apple.com>
+
+        WebCore: Remove iOS 11 macros from RenderThemeIOS.mm
+        https://bugs.webkit.org/show_bug.cgi?id=206787
+
+        Reviewed by Darin Adler.
+
+        No functional changes, covered by existing tests.
+
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::cachedSystemFontDescription const):
+        (WebCore::RenderThemeIOS::updateCachedSystemFontDescription const):
+
 2020-01-27  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1164 +1164 @@
     static NeverDestroyed<FontCascadeDescription> shortCaption1Font;
     static NeverDestroyed<FontCascadeDescription> tallBodyFont;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if HAVE(SYSTEM_FONT_STYLE_TITLE_0)
     static NeverDestroyed<FontCascadeDescription> title0Font;
 #endif
@@ -1170 +1170 @@
     static NeverDestroyed<FontCascadeDescription> title2Font;
     static NeverDestroyed<FontCascadeDescription> title3Font;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if HAVE(SYSTEM_FONT_STYLE_TITLE_4)
     static NeverDestroyed<FontCascadeDescription> title4Font;
 #endif
@@ -1198 +1198 @@
     case CSSValueAppleSystemBody:
         return bodyFont;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if HAVE(SYSTEM_FONT_STYLE_TITLE_0)
     case CSSValueAppleSystemTitle0:
         return title0Font;
@@ -1208 +1208 @@
     case CSSValueAppleSystemTitle3:
         return title3Font;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if HAVE(SYSTEM_FONT_STYLE_TITLE_4)
     case CSSValueAppleSystemTitle4:
         return title4Font;
@@ -1267 +1267 @@
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), nullptr));
         break;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if HAVE(SYSTEM_FONT_STYLE_TITLE_0)
     case CSSValueAppleSystemTitle0:
         textStyle = kCTUIFontTextStyleTitle0;
@@ -1285 +1285 @@
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), nullptr));
         break;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if HAVE(SYSTEM_FONT_STYLE_TITLE_4)
     case CSSValueAppleSystemTitle4:
         textStyle = kCTUIFontTextStyleTitle4;