Title: [277233] trunk/Source/WebCore
- Revision
- 277233
- Author
- mmaxfi...@apple.com
- Date
- 2021-05-08 17:51:46 -0700 (Sat, 08 May 2021)
Log Message
[Cocoa] Unify font collection handling between all Cocoa ports
https://bugs.webkit.org/show_bug.cgi?id=225566
Reviewed by Darin Adler.
Just remove an unnecessary #if.
Covered by existing tests.
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (277232 => 277233)
--- trunk/Source/WebCore/ChangeLog 2021-05-09 00:13:59 UTC (rev 277232)
+++ trunk/Source/WebCore/ChangeLog 2021-05-09 00:51:46 UTC (rev 277233)
@@ -1,5 +1,19 @@
2021-05-08 Myles C. Maxfield <mmaxfi...@apple.com>
+ [Cocoa] Unify font collection handling between all Cocoa ports
+ https://bugs.webkit.org/show_bug.cgi?id=225566
+
+ Reviewed by Darin Adler.
+
+ Just remove an unnecessary #if.
+
+ Covered by existing tests.
+
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::createFontCustomPlatformData):
+
+2021-05-08 Myles C. Maxfield <mmaxfi...@apple.com>
+
Add bounds checks around calls to GlyphBuffer::stringOffsetAt()
https://bugs.webkit.org/show_bug.cgi?id=225335
<rdar://problem/75663608>
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (277232 => 277233)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2021-05-09 00:13:59 UTC (rev 277232)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2021-05-09 00:51:46 UTC (rev 277233)
@@ -56,8 +56,6 @@
RetainPtr<CFDataRef> bufferData = buffer.createCFData();
RetainPtr<CTFontDescriptorRef> fontDescriptor;
-// FIXME: Likely we can remove this special case for watchOS and tvOS.
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
auto array = adoptCF(CTFontManagerCreateFontDescriptorsFromData(bufferData.get()));
if (!array)
return nullptr;
@@ -78,12 +76,6 @@
}
if (!fontDescriptor)
fontDescriptor = static_cast<CTFontDescriptorRef>(CFArrayGetValueAtIndex(array.get(), 0));
-#else
- UNUSED_PARAM(itemInCollection);
- fontDescriptor = adoptCF(CTFontManagerCreateFontDescriptorFromData(bufferData.get()));
- if (!fontDescriptor)
- return nullptr;
-#endif
FontPlatformData::CreationData creationData = { buffer, itemInCollection };
return makeUnique<FontCustomPlatformData>(fontDescriptor.get(), WTFMove(creationData));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
