Diff
Modified: trunk/Source/WebCore/ChangeLog (272705 => 272706)
--- trunk/Source/WebCore/ChangeLog 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/ChangeLog 2021-02-11 05:28:46 UTC (rev 272706)
@@ -1,3 +1,33 @@
+2021-02-10 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Move pal/spi/cocoa/CoreTextSPI.h to pal/spi/cf/CoreTextSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=221683
+
+ Reviewed by Simon Fraser.
+
+ Core Text has a C API, and doesn't depend on UIKit/AppKit. It also exists on Windows,
+ where there is no Cocoa. And pal/spi/cf already includes things like CoreAudioSPI.h
+ and CoreVideoSPI.h
+
+ No new tests because there is no behavior change.
+
+ * platform/cocoa/DragImageCocoa.mm:
+ * platform/graphics/Font.cpp:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp:
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ * platform/graphics/cocoa/SystemFontDatabaseCoreText.h:
+ * platform/graphics/coretext/FontCascadeCoreText.cpp:
+ * platform/graphics/coretext/FontCoreText.cpp:
+ * platform/graphics/coretext/FontPlatformDataCoreText.cpp:
+ * platform/graphics/coretext/GlyphPageCoreText.cpp:
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ * platform/graphics/mac/SimpleFontDataCoreText.cpp:
+ * rendering/RenderThemeCocoa.mm:
+ * rendering/RenderThemeIOS.mm:
+ * testing/Internals.cpp:
+
2021-02-10 Ryosuke Niwa <rn...@webkit.org>
Reduce the overhead of DocumentFragment in innerHTML & outerHTML
Modified: trunk/Source/WebCore/PAL/ChangeLog (272705 => 272706)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-02-11 05:28:46 UTC (rev 272706)
@@ -1,3 +1,18 @@
+2021-02-10 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Move pal/spi/cocoa/CoreTextSPI.h to pal/spi/cf/CoreTextSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=221683
+
+ Reviewed by Simon Fraser.
+
+ Core Text has a C API, and doesn't depend on UIKit/AppKit. It also exists on Windows,
+ where there is no Cocoa. And pal/spi/cf already includes things like CoreAudioSPI.h
+ and CoreVideoSPI.h
+
+ * PAL.xcodeproj/project.pbxproj:
+ * pal/PlatformMac.cmake:
+ * pal/spi/cf/CoreTextSPI.h: Renamed from Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h.
+
2021-02-05 Eric Carlson <eric.carl...@apple.com>
[Mac] Connect MediaSession with MediaRemote and NowPlaying
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (272705 => 272706)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2021-02-11 05:28:46 UTC (rev 272706)
@@ -450,6 +450,7 @@
0C2DA06A1F33CA8400DBC317 /* CFUtilitiesSPI.h */,
0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */,
0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */,
+ 0C2DA1241F3BEB4900DBC317 /* CoreTextSPI.h */,
CD17B268255F1625008430F9 /* CoreVideoSPI.h */,
);
path = cf;
@@ -481,7 +482,6 @@
7A36D0F8223AD9AB00B0522E /* CommonCryptoSPI.h */,
ABCA536724895DB900361BFF /* CoreMotionSPI.h */,
C138EA1A2436447200656DF1 /* CoreServicesSPI.h */,
- 0C2DA1241F3BEB4900DBC317 /* CoreTextSPI.h */,
0C2DA1251F3BEB4900DBC317 /* DataDetectorsCoreSPI.h */,
1D12CC4A2411BCAE00FDA0A3 /* FeatureFlagsSPI.h */,
CE5673862151A7B9002F92D7 /* IOKitSPI.h */,
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (272705 => 272706)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-02-11 05:28:46 UTC (rev 272706)
@@ -17,6 +17,7 @@
spi/cf/CFUtilitiesSPI.h
spi/cf/CoreAudioSPI.h
spi/cf/CoreMediaSPI.h
+ spi/cf/CoreTextSPI.h
spi/cg/CoreGraphicsSPI.h
spi/cg/ImageIOSPI.h
@@ -31,7 +32,6 @@
spi/cocoa/AudioToolboxSPI.h
spi/cocoa/CFNSURLConnectionSPI.h
spi/cocoa/CommonCryptoSPI.h
- spi/cocoa/CoreTextSPI.h
spi/cocoa/DataDetectorsCoreSPI.h
spi/cocoa/IOKitSPI.h
spi/cocoa/IOPMLibSPI.h
Copied: trunk/Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h (from rev 272705, trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h) (0 => 272706)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h 2021-02-11 05:28:46 UTC (rev 272706)
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2014-2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <CoreText/CoreText.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <CoreText/CoreTextPriv.h>
+
+#else
+
+enum {
+ kCTFontUIFontSystemItalic = 27,
+ kCTFontUIFontSystemThin = 102,
+ kCTFontUIFontSystemLight = 103,
+ kCTFontUIFontSystemUltraLight = 104,
+};
+
+typedef CF_OPTIONS(uint32_t, CTFontTransformOptions) {
+ kCTFontTransformApplyShaping = (1 << 0),
+ kCTFontTransformApplyPositioning = (1 << 1)
+};
+
+typedef CF_OPTIONS(CFOptionFlags, CTFontShapeOptions) {
+ kCTFontShapeWithKerning = (1 << 0),
+ kCTFontShapeWithClusterComposition = (1 << 1),
+ kCTFontShapeRightToLeft = (1 << 2),
+};
+
+typedef CF_OPTIONS(uint32_t, CTFontDescriptorOptions) {
+ kCTFontDescriptorOptionSystemUIFont = 1 << 1,
+ kCTFontDescriptorOptionPreferAppleSystemFont = kCTFontOptionsPreferSystemFont
+};
+
+enum {
+ kCTRunStatusHasOrigins = (1 << 4),
+};
+
+typedef CF_OPTIONS(CFOptionFlags, CTFontFallbackOption) {
+ kCTFontFallbackOptionNone = 0,
+ kCTFontFallbackOptionSystem = 1 << 0,
+ kCTFontFallbackOptionUserInstalled = 1 << 1,
+ kCTFontFallbackOptionDefault = kCTFontFallbackOptionSystem | kCTFontFallbackOptionUserInstalled,
+};
+
+typedef CF_ENUM(uint8_t, CTCompositionLanguage)
+{
+ kCTCompositionLanguageUnset,
+ kCTCompositionLanguageNone,
+ kCTCompositionLanguageJapanese,
+ kCTCompositionLanguageSimplifiedChinese,
+ kCTCompositionLanguageTraditionalChinese,
+};
+
+enum {
+ kCTFontTraitTightLeading = (1 << 15),
+ kCTFontTraitEmphasized = kCTFontTraitBold,
+};
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+typedef const UniChar* (*CTUniCharProviderCallback)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon);
+typedef void (*CTUniCharDisposeCallback)(const UniChar* chars, void* refCon);
+
+extern const CFStringRef kCTFontReferenceURLAttribute;
+extern const CFStringRef kCTFontOpticalSizeAttribute;
+extern const CFStringRef kCTFontPostScriptNameAttribute;
+extern const CFStringRef kCTFontUserInstalledAttribute;
+extern const CFStringRef kCTFontFallbackOptionAttribute;
+
+extern const CFStringRef kCTFontCSSFamilySerif;
+extern const CFStringRef kCTFontCSSFamilySansSerif;
+extern const CFStringRef kCTFontCSSFamilyCursive;
+extern const CFStringRef kCTFontCSSFamilyFantasy;
+extern const CFStringRef kCTFontCSSFamilyMonospace;
+extern const CFStringRef kCTFontCSSFamilySystemUI;
+
+bool CTFontTransformGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CFIndex count, CTFontTransformOptions);
+#if USE(CTFONTSHAPEGLYPHS)
+// CTFontShapeOptions isn't defined on Mojave.
+CGSize CTFontShapeGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CGPoint origins[], CFIndex indexes[], const UniChar chars[], CFIndex count, CTFontShapeOptions, CFStringRef language, void (^handler)(CFRange, CGGlyph**, CGSize**, CGPoint**, CFIndex**));
+#endif
+
+CGSize CTRunGetInitialAdvance(CTRunRef);
+CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback, CTUniCharDisposeCallback, void* refCon);
+void CTRunGetBaseAdvancesAndOrigins(CTRunRef, CFRange, CGSize baseAdvances[], CGPoint origins[]);
+CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback, CTUniCharDisposeCallback, void* refCon, CFDictionaryRef options);
+bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
+void CTFontGetUnsummedAdvancesForGlyphsAndStyle(CTFontRef, CTFontOrientation, CGFontRenderingStyle, const CGGlyph[], CGSize advances[], CFIndex count);
+CTFontDescriptorRef CTFontDescriptorCreateForCSSFamily(CFStringRef cssFamily, CFStringRef language);
+bool CTFontGetGlyphsForCharacterRange(CTFontRef, CGGlyph glyphs[], CFRange);
+
+CTFontDescriptorRef CTFontDescriptorCreateForUIType(CTFontUIFontType, CGFloat size, CFStringRef language);
+CTFontDescriptorRef CTFontDescriptorCreateWithTextStyle(CFStringRef style, CFStringRef size, CFStringRef language);
+CTFontDescriptorRef CTFontDescriptorCreateCopyWithSymbolicTraits(CTFontDescriptorRef original, CTFontSymbolicTraits symTraitValue, CTFontSymbolicTraits symTraitMask);
+CTFontDescriptorRef CTFontDescriptorCreateWithTextStyleAndAttributes(CFStringRef style, CFStringRef size, CFDictionaryRef attributes);
+CFBitVectorRef CTFontCopyGlyphCoverageForFeature(CTFontRef, CFDictionaryRef feature);
+
+CTFontDescriptorRef CTFontDescriptorCreateWithAttributesAndOptions(CFDictionaryRef attributes, CTFontDescriptorOptions);
+CTFontDescriptorRef CTFontDescriptorCreateLastResort();
+
+CFArrayRef CTFontManagerCreateFontDescriptorsFromData(CFDataRef);
+
+void CTParagraphStyleSetCompositionLanguage(CTParagraphStyleRef, CTCompositionLanguage);
+
+extern const CFStringRef kCTFontCSSWeightAttribute;
+extern const CFStringRef kCTFontCSSWidthAttribute;
+extern const CFStringRef kCTFontDescriptorTextStyleAttribute;
+extern const CFStringRef kCTFontUIFontDesignTrait;
+
+extern const CFStringRef kCTFontUIFontDesignDefault;
+extern const CFStringRef kCTFontUIFontDesignSerif;
+extern const CFStringRef kCTFontUIFontDesignMonospaced;
+extern const CFStringRef kCTFontUIFontDesignRounded;
+
+extern const CFStringRef kCTFrameMaximumNumberOfLinesAttributeName;
+
+bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
+bool CTFontIsSystemUIFont(CTFontRef);
+CTFontRef CTFontCreateForCSS(CFStringRef name, uint16_t weight, CTFontSymbolicTraits, CGFloat size);
+CTFontRef CTFontCreateForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CFIndex *coveredLength);
+CTFontRef CTFontCreateForCharactersWithLanguageAndOption(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CTFontFallbackOption, CFIndex *coveredLength);
+CTFontRef CTFontCopyPhysicalFont(CTFontRef);
+CTFontSymbolicTraits CTFontGetPhysicalSymbolicTraits(CTFontRef);
+
+extern const CFStringRef kCTUIFontTextStyleShortHeadline;
+extern const CFStringRef kCTUIFontTextStyleShortBody;
+extern const CFStringRef kCTUIFontTextStyleShortSubhead;
+extern const CFStringRef kCTUIFontTextStyleShortFootnote;
+extern const CFStringRef kCTUIFontTextStyleShortCaption1;
+extern const CFStringRef kCTUIFontTextStyleTallBody;
+
+extern const CFStringRef kCTUIFontTextStyleHeadline;
+extern const CFStringRef kCTUIFontTextStyleBody;
+extern const CFStringRef kCTUIFontTextStyleSubhead;
+extern const CFStringRef kCTUIFontTextStyleFootnote;
+extern const CFStringRef kCTUIFontTextStyleCaption1;
+extern const CFStringRef kCTUIFontTextStyleCaption2;
+
+extern const CFStringRef kCTFontDescriptorTextStyleEmphasized;
+
+extern const CFStringRef kCTFontContentSizeCategoryL;
+extern const CFStringRef kCTFontContentSizeCategoryXXXL;
+
+extern const CGFloat kCTFontWeightUltraLight;
+extern const CGFloat kCTFontWeightThin;
+extern const CGFloat kCTFontWeightLight;
+extern const CGFloat kCTFontWeightRegular;
+extern const CGFloat kCTFontWeightMedium;
+extern const CGFloat kCTFontWeightSemibold;
+extern const CGFloat kCTFontWeightBold;
+extern const CGFloat kCTFontWeightHeavy;
+extern const CGFloat kCTFontWeightBlack;
+
+extern const CGFloat kCTFontWidthUltraCompressed;
+extern const CGFloat kCTFontWidthExtraCompressed;
+extern const CGFloat kCTFontWidthCompressed;
+extern const CGFloat kCTFontWidthExtraCondensed;
+extern const CGFloat kCTFontWidthCondensed;
+extern const CGFloat kCTFontWidthSemiCondensed;
+extern const CGFloat kCTFontWidthStandard;
+extern const CGFloat kCTFontWidthSemiExpanded;
+extern const CGFloat kCTFontWidthExpanded;
+extern const CGFloat kCTFontWidthExtraExpanded;
+
+extern const CFStringRef kCTUIFontTextStyleTitle0;
+extern const CFStringRef kCTUIFontTextStyleTitle1;
+extern const CFStringRef kCTUIFontTextStyleTitle2;
+extern const CFStringRef kCTUIFontTextStyleTitle3;
+extern const CFStringRef kCTUIFontTextStyleTitle4;
+CTFontDescriptorRef CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
+
+bool CTFontIsAppleColorEmoji(CTFontRef);
+CTFontRef CTFontCreateForCharacters(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFIndex *coveredLength);
+
+WTF_EXTERN_C_END
Deleted: trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h (272705 => 272706)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h 2021-02-11 05:28:46 UTC (rev 272706)
@@ -1,203 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <CoreText/CoreText.h>
-#include <pal/spi/cg/CoreGraphicsSPI.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#include <CoreText/CoreTextPriv.h>
-
-#else
-
-enum {
- kCTFontUIFontSystemItalic = 27,
- kCTFontUIFontSystemThin = 102,
- kCTFontUIFontSystemLight = 103,
- kCTFontUIFontSystemUltraLight = 104,
-};
-
-typedef CF_OPTIONS(uint32_t, CTFontTransformOptions) {
- kCTFontTransformApplyShaping = (1 << 0),
- kCTFontTransformApplyPositioning = (1 << 1)
-};
-
-typedef CF_OPTIONS(CFOptionFlags, CTFontShapeOptions) {
- kCTFontShapeWithKerning = (1 << 0),
- kCTFontShapeWithClusterComposition = (1 << 1),
- kCTFontShapeRightToLeft = (1 << 2),
-};
-
-typedef CF_OPTIONS(uint32_t, CTFontDescriptorOptions) {
- kCTFontDescriptorOptionSystemUIFont = 1 << 1,
- kCTFontDescriptorOptionPreferAppleSystemFont = kCTFontOptionsPreferSystemFont
-};
-
-enum {
- kCTRunStatusHasOrigins = (1 << 4),
-};
-
-typedef CF_OPTIONS(CFOptionFlags, CTFontFallbackOption) {
- kCTFontFallbackOptionNone = 0,
- kCTFontFallbackOptionSystem = 1 << 0,
- kCTFontFallbackOptionUserInstalled = 1 << 1,
- kCTFontFallbackOptionDefault = kCTFontFallbackOptionSystem | kCTFontFallbackOptionUserInstalled,
-};
-
-typedef CF_ENUM(uint8_t, CTCompositionLanguage)
-{
- kCTCompositionLanguageUnset,
- kCTCompositionLanguageNone,
- kCTCompositionLanguageJapanese,
- kCTCompositionLanguageSimplifiedChinese,
- kCTCompositionLanguageTraditionalChinese,
-};
-
-enum {
- kCTFontTraitTightLeading = (1 << 15),
- kCTFontTraitEmphasized = kCTFontTraitBold,
-};
-
-#endif
-
-WTF_EXTERN_C_BEGIN
-
-typedef const UniChar* (*CTUniCharProviderCallback)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon);
-typedef void (*CTUniCharDisposeCallback)(const UniChar* chars, void* refCon);
-
-extern const CFStringRef kCTFontReferenceURLAttribute;
-extern const CFStringRef kCTFontOpticalSizeAttribute;
-extern const CFStringRef kCTFontPostScriptNameAttribute;
-extern const CFStringRef kCTFontUserInstalledAttribute;
-extern const CFStringRef kCTFontFallbackOptionAttribute;
-
-extern const CFStringRef kCTFontCSSFamilySerif;
-extern const CFStringRef kCTFontCSSFamilySansSerif;
-extern const CFStringRef kCTFontCSSFamilyCursive;
-extern const CFStringRef kCTFontCSSFamilyFantasy;
-extern const CFStringRef kCTFontCSSFamilyMonospace;
-extern const CFStringRef kCTFontCSSFamilySystemUI;
-
-bool CTFontTransformGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CFIndex count, CTFontTransformOptions);
-#if USE(CTFONTSHAPEGLYPHS)
-// CTFontShapeOptions isn't defined on Mojave.
-CGSize CTFontShapeGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CGPoint origins[], CFIndex indexes[], const UniChar chars[], CFIndex count, CTFontShapeOptions, CFStringRef language, void (^handler)(CFRange, CGGlyph**, CGSize**, CGPoint**, CFIndex**));
-#endif
-
-CGSize CTRunGetInitialAdvance(CTRunRef);
-CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback, CTUniCharDisposeCallback, void* refCon);
-void CTRunGetBaseAdvancesAndOrigins(CTRunRef, CFRange, CGSize baseAdvances[], CGPoint origins[]);
-CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback, CTUniCharDisposeCallback, void* refCon, CFDictionaryRef options);
-bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
-void CTFontGetUnsummedAdvancesForGlyphsAndStyle(CTFontRef, CTFontOrientation, CGFontRenderingStyle, const CGGlyph[], CGSize advances[], CFIndex count);
-CTFontDescriptorRef CTFontDescriptorCreateForCSSFamily(CFStringRef cssFamily, CFStringRef language);
-bool CTFontGetGlyphsForCharacterRange(CTFontRef, CGGlyph glyphs[], CFRange);
-
-CTFontDescriptorRef CTFontDescriptorCreateForUIType(CTFontUIFontType, CGFloat size, CFStringRef language);
-CTFontDescriptorRef CTFontDescriptorCreateWithTextStyle(CFStringRef style, CFStringRef size, CFStringRef language);
-CTFontDescriptorRef CTFontDescriptorCreateCopyWithSymbolicTraits(CTFontDescriptorRef original, CTFontSymbolicTraits symTraitValue, CTFontSymbolicTraits symTraitMask);
-CTFontDescriptorRef CTFontDescriptorCreateWithTextStyleAndAttributes(CFStringRef style, CFStringRef size, CFDictionaryRef attributes);
-CFBitVectorRef CTFontCopyGlyphCoverageForFeature(CTFontRef, CFDictionaryRef feature);
-
-CTFontDescriptorRef CTFontDescriptorCreateWithAttributesAndOptions(CFDictionaryRef attributes, CTFontDescriptorOptions);
-CTFontDescriptorRef CTFontDescriptorCreateLastResort();
-
-CFArrayRef CTFontManagerCreateFontDescriptorsFromData(CFDataRef);
-
-void CTParagraphStyleSetCompositionLanguage(CTParagraphStyleRef, CTCompositionLanguage);
-
-extern const CFStringRef kCTFontCSSWeightAttribute;
-extern const CFStringRef kCTFontCSSWidthAttribute;
-extern const CFStringRef kCTFontDescriptorTextStyleAttribute;
-extern const CFStringRef kCTFontUIFontDesignTrait;
-
-extern const CFStringRef kCTFontUIFontDesignDefault;
-extern const CFStringRef kCTFontUIFontDesignSerif;
-extern const CFStringRef kCTFontUIFontDesignMonospaced;
-extern const CFStringRef kCTFontUIFontDesignRounded;
-
-extern const CFStringRef kCTFrameMaximumNumberOfLinesAttributeName;
-
-bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
-bool CTFontIsSystemUIFont(CTFontRef);
-CTFontRef CTFontCreateForCSS(CFStringRef name, uint16_t weight, CTFontSymbolicTraits, CGFloat size);
-CTFontRef CTFontCreateForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CFIndex *coveredLength);
-CTFontRef CTFontCreateForCharactersWithLanguageAndOption(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CTFontFallbackOption option, CFIndex *coveredLength);
-CTFontRef CTFontCopyPhysicalFont(CTFontRef);
-CTFontSymbolicTraits CTFontGetPhysicalSymbolicTraits(CTFontRef);
-
-extern const CFStringRef kCTUIFontTextStyleShortHeadline;
-extern const CFStringRef kCTUIFontTextStyleShortBody;
-extern const CFStringRef kCTUIFontTextStyleShortSubhead;
-extern const CFStringRef kCTUIFontTextStyleShortFootnote;
-extern const CFStringRef kCTUIFontTextStyleShortCaption1;
-extern const CFStringRef kCTUIFontTextStyleTallBody;
-
-extern const CFStringRef kCTUIFontTextStyleHeadline;
-extern const CFStringRef kCTUIFontTextStyleBody;
-extern const CFStringRef kCTUIFontTextStyleSubhead;
-extern const CFStringRef kCTUIFontTextStyleFootnote;
-extern const CFStringRef kCTUIFontTextStyleCaption1;
-extern const CFStringRef kCTUIFontTextStyleCaption2;
-
-extern const CFStringRef kCTFontDescriptorTextStyleEmphasized;
-
-extern const CFStringRef kCTFontContentSizeCategoryL;
-extern const CFStringRef kCTFontContentSizeCategoryXXXL;
-
-extern const CGFloat kCTFontWeightUltraLight;
-extern const CGFloat kCTFontWeightThin;
-extern const CGFloat kCTFontWeightLight;
-extern const CGFloat kCTFontWeightRegular;
-extern const CGFloat kCTFontWeightMedium;
-extern const CGFloat kCTFontWeightSemibold;
-extern const CGFloat kCTFontWeightBold;
-extern const CGFloat kCTFontWeightHeavy;
-extern const CGFloat kCTFontWeightBlack;
-
-extern const CGFloat kCTFontWidthUltraCompressed;
-extern const CGFloat kCTFontWidthExtraCompressed;
-extern const CGFloat kCTFontWidthCompressed;
-extern const CGFloat kCTFontWidthExtraCondensed;
-extern const CGFloat kCTFontWidthCondensed;
-extern const CGFloat kCTFontWidthSemiCondensed;
-extern const CGFloat kCTFontWidthStandard;
-extern const CGFloat kCTFontWidthSemiExpanded;
-extern const CGFloat kCTFontWidthExpanded;
-extern const CGFloat kCTFontWidthExtraExpanded;
-
-extern const CFStringRef kCTUIFontTextStyleTitle0;
-extern const CFStringRef kCTUIFontTextStyleTitle1;
-extern const CFStringRef kCTUIFontTextStyleTitle2;
-extern const CFStringRef kCTUIFontTextStyleTitle3;
-extern const CFStringRef kCTUIFontTextStyleTitle4;
-CTFontDescriptorRef CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
-
-bool CTFontIsAppleColorEmoji(CTFontRef);
-CTFontRef CTFontCreateForCharacters(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFIndex *coveredLength);
-
-WTF_EXTERN_C_END
Modified: trunk/Source/WebCore/platform/cocoa/DragImageCocoa.mm (272705 => 272706)
--- trunk/Source/WebCore/platform/cocoa/DragImageCocoa.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/cocoa/DragImageCocoa.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -42,8 +42,8 @@
#import "StringTruncator.h"
#import "TextIndicator.h"
#import "WebKitNSImageExtras.h"
+#import <pal/spi/cf/CoreTextSPI.h>
#import <pal/spi/cg/CoreGraphicsSPI.h>
-#import <pal/spi/cocoa/CoreTextSPI.h>
#import <pal/spi/cocoa/URLFormattingSPI.h>
#import <wtf/SoftLinking.h>
#import <wtf/URL.h>
Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/Font.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -31,7 +31,7 @@
#include "Font.h"
#if PLATFORM(COCOA)
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#endif
#include "CachedFont.h"
#include "CharacterProperties.h"
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -31,7 +31,7 @@
#include "FontFamilySpecificationCoreText.h"
#include "RenderThemeCocoa.h"
#include "SystemFontDatabaseCoreText.h"
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#include <CoreText/SFNTLayoutTypes.h>
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -28,7 +28,7 @@
#include "FontCache.h"
#include "FontSelector.h"
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#include <wtf/HashFunctions.h>
#include <wtf/HashMap.h>
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -26,7 +26,7 @@
#import "FontCacheCoreText.h"
#import "SharedBuffer.h"
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#import <wtf/text/StringConcatenateNumbers.h>
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h 2021-02-11 05:28:46 UTC (rev 272706)
@@ -26,7 +26,7 @@
#pragma once
#include "FontDescription.h"
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#include <wtf/HashMap.h>
#include <wtf/HashTraits.h>
#include <wtf/text/AtomString.h>
Modified: trunk/Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -34,7 +34,7 @@
#include <wtf/MathExtras.h>
#if PLATFORM(COCOA)
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#else
#include <pal/spi/win/CoreTextSPIWin.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/coretext/FontCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/coretext/FontCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/coretext/FontCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -44,7 +44,7 @@
#if PLATFORM(COCOA)
#include "LocaleCocoa.h"
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#else
#include <pal/spi/win/CoreTextSPIWin.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/coretext/FontPlatformDataCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/coretext/FontPlatformDataCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/coretext/FontPlatformDataCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -28,7 +28,7 @@
#include <wtf/text/StringConcatenateNumbers.h>
#if PLATFORM(COCOA)
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#else
#include <pal/spi/win/CoreTextSPIWin.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/coretext/GlyphPageCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/coretext/GlyphPageCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/coretext/GlyphPageCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -34,7 +34,7 @@
#include <pal/spi/cg/CoreGraphicsSPI.h>
#if PLATFORM(COCOA)
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#else
#include <pal/spi/win/CoreTextSPIWin.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -28,7 +28,7 @@
#import "FontCache.h"
#import "FontCascade.h"
#import <CoreText/CoreText.h>
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#import <wtf/SoftLinking.h>
#import <wtf/WeakPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -29,7 +29,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreGraphics/CoreGraphics.h>
#include <CoreText/CoreText.h>
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp (272705 => 272706)
--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -28,7 +28,7 @@
#include "Font.h"
#include <CoreText/CoreText.h>
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (272705 => 272706)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -30,7 +30,7 @@
#import "HTMLInputElement.h"
#import "RenderText.h"
#import <algorithm>
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#if ENABLE(VIDEO)
#import "LocalizedStrings.h"
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (272705 => 272706)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -78,7 +78,7 @@
#import <CoreGraphics/CoreGraphics.h>
#import <CoreImage/CoreImage.h>
#import <objc/runtime.h>
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#import <pal/spi/ios/UIKitSPI.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/ObjCRuntimeExtras.h>
Modified: trunk/Source/WebCore/testing/Internals.cpp (272705 => 272706)
--- trunk/Source/WebCore/testing/Internals.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebCore/testing/Internals.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -329,7 +329,7 @@
#if PLATFORM(COCOA)
#include "SystemBattery.h"
#include "VP9UtilitiesCocoa.h"
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#include <wtf/spi/darwin/SandboxSPI.h>
#endif
Modified: trunk/Source/WebKit/ChangeLog (272705 => 272706)
--- trunk/Source/WebKit/ChangeLog 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebKit/ChangeLog 2021-02-11 05:28:46 UTC (rev 272706)
@@ -1,3 +1,19 @@
+2021-02-10 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Move pal/spi/cocoa/CoreTextSPI.h to pal/spi/cf/CoreTextSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=221683
+
+ Reviewed by Simon Fraser.
+
+ Core Text has a C API, and doesn't depend on UIKit/AppKit. It also exists on Windows,
+ where there is no Cocoa. And pal/spi/cf already includes things like CoreAudioSPI.h
+ and CoreVideoSPI.h
+
+ * Shared/Cocoa/CoreTextHelpers.mm:
+ * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+ * UIProcess/ios/forms/WKNumberPadView.mm:
+ * WebProcess/WebPage/WebPage.cpp:
+
2021-02-10 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, reverting r272702.
Modified: trunk/Source/WebKit/Shared/Cocoa/CoreTextHelpers.mm (272705 => 272706)
--- trunk/Source/WebKit/Shared/Cocoa/CoreTextHelpers.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebKit/Shared/Cocoa/CoreTextHelpers.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -26,7 +26,7 @@
#import "config.h"
#import "CoreTextHelpers.h"
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#import <wtf/BlockObjCExceptions.h>
namespace WebKit {
Modified: trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (272705 => 272706)
--- trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -34,7 +34,7 @@
#import <WebCore/Font.h>
#import <WebCore/FontAttributes.h>
#import <WebCore/FontCustomPlatformData.h>
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#if PLATFORM(IOS_FAMILY)
#import <UIKit/UIFont.h>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm (272705 => 272706)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKNumberPadView.mm 2021-02-11 05:28:46 UTC (rev 272706)
@@ -32,7 +32,7 @@
#import "WKNumberPadViewController.h"
#import <WebCore/LocalizedStrings.h>
-#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cf/CoreTextSPI.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/RetainPtr.h>
#import <wtf/WeakObjCPtr.h>
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (272705 => 272706)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-02-11 05:23:52 UTC (rev 272705)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-02-11 05:28:46 UTC (rev 272706)
@@ -310,7 +310,7 @@
#include "WebAutocorrectionContext.h"
#include <CoreGraphics/CoreGraphics.h>
#include <WebCore/Icon.h>
-#include <pal/spi/cocoa/CoreTextSPI.h>
+#include <pal/spi/cf/CoreTextSPI.h>
#endif
#if PLATFORM(MAC)
