Diff
Modified: trunk/Source/WTF/ChangeLog (266671 => 266672)
--- trunk/Source/WTF/ChangeLog 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WTF/ChangeLog 2020-09-05 21:34:14 UTC (rev 266672)
@@ -1,5 +1,14 @@
2020-09-05 Myles C. Maxfield <[email protected]>
+ [Cocoa] USE(PLATFORM_SYSTEM_FALLBACK_LIST) is true on all Cocoa platforms, so there's no need to consult it in Cocoa-specific files
+ https://bugs.webkit.org/show_bug.cgi?id=215684
+
+ Reviewed by Darin Adler.
+
+ * wtf/PlatformUse.h:
+
+2020-09-05 Myles C. Maxfield <[email protected]>
+
[Cocoa] CTFontIsSystemUIFont() is faster than CTFontDescriptorIsSystemUIFont()/CTFontCopyFontDescriptor()
https://bugs.webkit.org/show_bug.cgi?id=215687
Modified: trunk/Source/WTF/wtf/PlatformUse.h (266671 => 266672)
--- trunk/Source/WTF/wtf/PlatformUse.h 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2020-09-05 21:34:14 UTC (rev 266672)
@@ -285,10 +285,6 @@
#define USE_UICONTEXTMENU 1
#endif
-#if PLATFORM(COCOA)
-#define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
-#endif
-
#if PLATFORM(IOS_FAMILY) || (!(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && (OS(LINUX) && (PLATFORM(GTK) || PLATFORM(WPE))))
#define USE_BMALLOC_MEMORY_FOOTPRINT_API 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (266671 => 266672)
--- trunk/Source/WebCore/ChangeLog 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/ChangeLog 2020-09-05 21:34:14 UTC (rev 266672)
@@ -1,3 +1,39 @@
+2020-09-05 Myles C. Maxfield <[email protected]>
+
+ [Cocoa] USE(PLATFORM_SYSTEM_FALLBACK_LIST) is true on all Cocoa platforms, so there's no need to consult it in Cocoa-specific files
+ https://bugs.webkit.org/show_bug.cgi?id=215684
+
+ Reviewed by Darin Adler.
+
+ Removes dead code.
+
+ No new tests because there is no behavior change.
+
+ * Configurations/WebCore.xcconfig:
+ * PlatformFTW.cmake:
+ * PlatformWin.cmake:
+ * page/cocoa/MemoryReleaseCocoa.mm:
+ (WebCore::platformReleaseMemory):
+ * platform/FreeType.cmake:
+ * platform/graphics/FontCascadeDescription.cpp:
+ (WebCore::FontCascadeDescription::effectiveFamilyCount const): Deleted.
+ (WebCore::FontCascadeDescription::effectiveFamilyAt const): Deleted.
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::invalidateFontCache):
+ * platform/graphics/cocoa/FontDescriptionCocoa.cpp:
+ (WebCore::FontCascadeDescription::effectiveFamilyAt const):
+ * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp:
+ (WebCore::FontFamilySpecificationCoreText::fontRanges const):
+ * platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp:
+ * platform/graphics/harfbuzz/FontDescriptionHarfBuzz.cpp: Added. Moved port-specific
+ implementations into port-specific files.
+ (WebCore::FontCascadeDescription::effectiveFamilyCount const):
+ (WebCore::FontCascadeDescription::effectiveFamilyAt const):
+ * platform/graphics/win/FontDescriptionWin.cpp: Added. Moved port-specific
+ implementations into port-specific files.
+ (WebCore::FontCascadeDescription::effectiveFamilyCount const):
+ (WebCore::FontCascadeDescription::effectiveFamilyAt const):
+
2020-09-05 Alex Christensen <[email protected]>
XML documents in iframes should not inherit encoding from parent frame
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (266671 => 266672)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2020-09-05 21:34:14 UTC (rev 266672)
@@ -124,15 +124,11 @@
WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting;
// FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit;
-WK_UNDEFINED_SYMBOLS_LDFLAGS[sdk=macosx*] = $(WK_UNDEFINED_SYMBOLS_LDFLAGS$(WK_MACOS_1013));
-WK_UNDEFINED_SYMBOLS_LDFLAGS_MACOS_BEFORE_1013 = -Wl,-U,_CTFontCreatePhysicalFontForCharactersWithLanguage;
-WK_UNDEFINED_SYMBOLS_LDFLAGS_MACOS_BEFORE_1013[sdk=macosx10.12*] =;
-
SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,WebCore.order;
Modified: trunk/Source/WebCore/PAL/ChangeLog (266671 => 266672)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-09-05 21:34:14 UTC (rev 266672)
@@ -1,5 +1,14 @@
2020-09-05 Myles C. Maxfield <[email protected]>
+ [Cocoa] USE(PLATFORM_SYSTEM_FALLBACK_LIST) is true on all Cocoa platforms, so there's no need to consult it in Cocoa-specific files
+ https://bugs.webkit.org/show_bug.cgi?id=215684
+
+ Reviewed by Darin Adler.
+
+ * pal/spi/cocoa/CoreTextSPI.h:
+
+2020-09-05 Myles C. Maxfield <[email protected]>
+
[Cocoa] CTFontIsSystemUIFont() is faster than CTFontDescriptorIsSystemUIFont()/CTFontCopyFontDescriptor()
https://bugs.webkit.org/show_bug.cgi?id=215687
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h (266671 => 266672)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h 2020-09-05 21:34:14 UTC (rev 266672)
@@ -179,7 +179,6 @@
extern const CFStringRef kCTUIFontTextStyleTitle4;
CTFontDescriptorRef CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
-__attribute__((availability(macosx, obsoleted = 10.13))) __attribute__((availability(ios, obsoleted = 11.0))) CTFontRef CTFontCreatePhysicalFontForCharactersWithLanguage(CTFontRef, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
bool CTFontIsAppleColorEmoji(CTFontRef);
CTFontRef CTFontCreateForCharacters(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFIndex *coveredLength);
Modified: trunk/Source/WebCore/PlatformFTW.cmake (266671 => 266672)
--- trunk/Source/WebCore/PlatformFTW.cmake 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/PlatformFTW.cmake 2020-09-05 21:34:14 UTC (rev 266672)
@@ -74,6 +74,7 @@
platform/graphics/win/FontCacheWin.cpp
platform/graphics/win/FontCascadeDirect2D.cpp
platform/graphics/win/FontCustomPlatformData.cpp
+ platform/graphics/win/FontDescriptionWin.cpp
platform/graphics/win/FontPlatformDataDirect2D.cpp
platform/graphics/win/FontPlatformDataWin.cpp
platform/graphics/win/FontWin.cpp
Modified: trunk/Source/WebCore/PlatformWin.cmake (266671 => 266672)
--- trunk/Source/WebCore/PlatformWin.cmake 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/PlatformWin.cmake 2020-09-05 21:34:14 UTC (rev 266672)
@@ -57,6 +57,7 @@
platform/graphics/win/FloatRectDirect2D.cpp
platform/graphics/win/FloatSizeDirect2D.cpp
platform/graphics/win/FontCacheWin.cpp
+ platform/graphics/win/FontDescriptionWin.cpp
platform/graphics/win/FontPlatformDataWin.cpp
platform/graphics/win/FontWin.cpp
platform/graphics/win/FullScreenController.cpp
Modified: trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm (266671 => 266672)
--- trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm 2020-09-05 21:34:14 UTC (rev 266672)
@@ -46,9 +46,7 @@
void platformReleaseMemory(Critical)
{
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
SystemFontDatabaseCoreText::singleton().clear();
-#endif
clearFontFamilySpecificationCoreTextCache();
#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
Modified: trunk/Source/WebCore/platform/FreeType.cmake (266671 => 266672)
--- trunk/Source/WebCore/platform/FreeType.cmake 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/platform/FreeType.cmake 2020-09-05 21:34:14 UTC (rev 266672)
@@ -13,6 +13,7 @@
platform/graphics/freetype/SimpleFontDataFreeType.cpp
platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
+ platform/graphics/harfbuzz/FontDescriptionHarfBuzz.cpp
)
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
Modified: trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp (266671 => 266672)
--- trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -63,20 +63,6 @@
{
}
-#if !USE(PLATFORM_SYSTEM_FALLBACK_LIST)
-
-unsigned FontCascadeDescription::effectiveFamilyCount() const
-{
- return familyCount();
-}
-
-FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned i) const
-{
- return familyAt(i);
-}
-
-#endif
-
FontSelectionValue FontCascadeDescription::lighterWeight(FontSelectionValue weight)
{
if (weight < FontSelectionValue(100))
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (266671 => 266672)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -1242,9 +1242,7 @@
return;
}
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
SystemFontDatabaseCoreText::singleton().clear();
-#endif
clearFontFamilySpecificationCoreTextCache();
FontDatabase::singletonAllowingUserInstalledFonts().clear();
@@ -1426,14 +1424,7 @@
}
#endif
-// FIXME: Why not do this on watchOS and tvOS?
-#if !USE(PLATFORM_SYSTEM_FALLBACK_LIST) && (PLATFORM(MAC) || PLATFORM(IOS))
-static RetainPtr<CTFontRef> createFontForCharacters(CTFontRef font, CFStringRef localeString, AllowUserInstalledFonts, const UChar* characters, unsigned length)
-{
- CFIndex coveredLength = 0;
- return adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString, &coveredLength));
-}
-#elif HAVE(CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION)
+#if HAVE(CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION)
static RetainPtr<CTFontRef> createFontForCharacters(CTFontRef font, CFStringRef localeString, AllowUserInstalledFonts allowUserInstalledFonts, const UChar* characters, unsigned length)
{
CFIndex coveredLength = 0;
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp (266671 => 266672)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -31,8 +31,6 @@
namespace WebCore {
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
-
template<typename T, typename U, std::size_t size, std::size_t... indices> std::array<T, size> convertArray(U (&array)[size], std::index_sequence<indices...>)
{
return { { array[indices]... } };
@@ -109,10 +107,9 @@
FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned index) const
{
- // The special cases in this function need to match the behavior in FontCacheCoreText.cpp. On systems
- // 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.
+ // The special cases in this function need to match the behavior in FontCacheCoreText.cpp. 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
// means that "src:local(system-ui)" can't follow the Core Text cascade list (the way it does for regular lookups).
// These two behaviors should be unified, which would hopefully allow us to delete this duplicate code.
@@ -133,8 +130,6 @@
return nullAtom();
}
-#endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST)
-
AtomString FontDescription::platformResolveGenericFamily(UScriptCode script, const AtomString& locale, const AtomString& familyName)
{
ASSERT((locale.isNull() && script == USCRIPT_COMMON) || !locale.isNull());
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp (266671 => 266672)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -103,10 +103,8 @@
auto font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
auto fontForSynthesisComputation = font;
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
if (auto physicalFont = adoptCF(CTFontCopyPhysicalFont(font.get())))
fontForSynthesisComputation = physicalFont;
-#endif
font = preparePlatformFont(font.get(), fontDescription, nullptr, { });
Modified: trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp (266671 => 266672)
--- trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp 2020-09-05 20:54:42 UTC (rev 266671)
+++ trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -44,8 +44,6 @@
{
}
-#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
-
RetainPtr<CTFontRef> SystemFontDatabaseCoreText::createSystemUIFont(const CascadeListParameters& parameters, CFStringRef locale)
{
// Work around a quirk of the platform API.
@@ -237,8 +235,6 @@
return cascadeList(systemFontParameters(description, cssFamily, systemFontKind, allowUserInstalledFonts), systemFontKind);
}
-#endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST)
-
static String genericFamily(const String& locale, HashMap<String, String>& map, CFStringRef ctKey)
{
return map.ensure(locale, [&] {
Added: trunk/Source/WebCore/platform/graphics/harfbuzz/FontDescriptionHarfBuzz.cpp (0 => 266672)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/FontDescriptionHarfBuzz.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/FontDescriptionHarfBuzz.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+#include "config.h"
+#include "FontCascadeDescription.h"
+
+namespace WebCore {
+
+unsigned FontCascadeDescription::effectiveFamilyCount() const
+{
+ return familyCount();
+}
+
+FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned index) const
+{
+ return familyAt(index);
+}
+
+}
+
Property changes on: trunk/Source/WebCore/platform/graphics/harfbuzz/FontDescriptionHarfBuzz.cpp
___________________________________________________________________
Added: svn:eol-style
+native
\ No newline at end of property
Added: trunk/Source/WebCore/platform/graphics/win/FontDescriptionWin.cpp (0 => 266672)
--- trunk/Source/WebCore/platform/graphics/win/FontDescriptionWin.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/win/FontDescriptionWin.cpp 2020-09-05 21:34:14 UTC (rev 266672)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+#include "config.h"
+#include "FontCascadeDescription.h"
+
+namespace WebCore {
+
+unsigned FontCascadeDescription::effectiveFamilyCount() const
+{
+ return familyCount();
+}
+
+FontFamilySpecification FontCascadeDescription::effectiveFamilyAt(unsigned index) const
+{
+ return familyAt(index);
+}
+
+}
+
Property changes on: trunk/Source/WebCore/platform/graphics/win/FontDescriptionWin.cpp
___________________________________________________________________
Added: svn:eol-style
+native
\ No newline at end of property
