Changeset 281792 in webkit

Timestamp:

Aug 31, 2021, 12:18:14 AM (5 years ago)

Author:

mmaxfield@apple.com

Message:

[Cocoa] Drawing system fallback fonts to canvas causes a crash
​https://bugs.webkit.org/show_bug.cgi?id=229633
<rdar://problem/81889036>

Reviewed by Wenson Hsieh.

Source/WebCore/PAL:

• pal/spi/cf/CoreTextSPI.h:

Source/WebKit:

Dot-prefixed font names don't survive the round-trip through
CTFontDescriptorCopyAttributes(CTFontCopyFontDescriptor(font)) unless you also
pass in the kCTFontOptionsSystemUIFont option.

Tests: fast/text/system-fallback-canvas.html

fast/text/draw-synthetic-system-bold-font-into-canvas.html

• Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:

(IPC::createCTFont):
(IPC::ArgumentCoder<Ref<WebCore::Font>>::decodePlatformData):

LayoutTests:

• fast/text/system-fallback-canvas-expected.txt: Added.
• fast/text/system-fallback-canvas.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/draw-synthetic-system-bold-font-into-canvas-expected-mismatch.html (added)
• LayoutTests/fast/text/draw-synthetic-system-bold-font-into-canvas.html (added)
• LayoutTests/fast/text/system-fallback-canvas-expected.txt (added)
• LayoutTests/fast/text/system-fallback-canvas.html (added)
• Source/WebCore/PAL/ChangeLog (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-31  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Drawing system fallback fonts to canvas causes a crash
+        https://bugs.webkit.org/show_bug.cgi?id=229633
+        <rdar://problem/81889036>
+
+        Reviewed by Wenson Hsieh.
+
+        * fast/text/system-fallback-canvas-expected.txt: Added.
+        * fast/text/system-fallback-canvas.html: Added.
+
 2021-08-30  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-08-31  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Drawing system fallback fonts to canvas causes a crash
+        https://bugs.webkit.org/show_bug.cgi?id=229633
+        <rdar://problem/81889036>
+
+        Reviewed by Wenson Hsieh.
+
+        * pal/spi/cf/CoreTextSPI.h:
+
 2021-08-26  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h

@@ -60 +60 @@
 
 enum {
+    kCTFontOptionsSystemUIFont = 1 << 1,
+};
+
+enum {
     kCTRunStatusHasOrigins = (1 << 4),
 };
@@ -149 +153 @@
 bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
 bool CTFontIsSystemUIFont(CTFontRef);
+CTFontRef CTFontCreateWithFontDescriptorAndOptions(CTFontDescriptorRef, CGFloat size, const CGAffineTransform*, CTFontOptions);
 CTFontRef CTFontCreateForCSS(CFStringRef name, uint16_t weight, CTFontSymbolicTraits, CGFloat size);
 CTFontRef CTFontCreateForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFStringRef language, CFIndex *coveredLength);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-31  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Drawing system fallback fonts to canvas causes a crash
+        https://bugs.webkit.org/show_bug.cgi?id=229633
+        <rdar://problem/81889036>
+
+        Reviewed by Wenson Hsieh.
+
+        Dot-prefixed font names don't survive the round-trip through
+        CTFontDescriptorCopyAttributes(CTFontCopyFontDescriptor(font)) unless you also
+        pass in the kCTFontOptionsSystemUIFont option.
+
+        Tests: fast/text/system-fallback-canvas.html
+               fast/text/draw-synthetic-system-bold-font-into-canvas.html
+
+        * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+        (IPC::createCTFont):
+        (IPC::ArgumentCoder<Ref<WebCore::Font>>::decodePlatformData):
+
 2021-08-26  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm

@@ -502 +502 @@
 }
 
+static RetainPtr<CTFontRef> createCTFont(CFDictionaryRef attributes, float size, const String& referenceURL, const String& postScriptName)
+{
+    if (auto name = static_cast<CFStringRef>(CFDictionaryGetValue(attributes, kCTFontNameAttribute))) {
+        if (CFStringHasPrefix(name, CFSTR("."))) {
+            auto fontDescriptor = adoptCF(CTFontDescriptorCreateWithAttributes(attributes));
+            if (!fontDescriptor)
+                return nullptr;
+            return adoptCF(CTFontCreateWithFontDescriptorAndOptions(fontDescriptor.get(), size, nullptr, kCTFontOptionsSystemUIFont));
+        }
+    }
+
+    auto fontDescriptor = findFontDescriptor(referenceURL, postScriptName);
+    if (!fontDescriptor)
+        return nullptr;
+    fontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), attributes));
+    return adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr));
+}
+
 std::optional<WebCore::FontPlatformData> ArgumentCoder<Ref<WebCore::Font>>::decodePlatformData(Decoder& decoder)
 {
@@ -581 +599 @@
         return std::nullopt;
 
-    auto fontDescriptor = findFontDescriptor(*referenceURL, *postScriptName);
-    if (!fontDescriptor)
-        return std::nullopt;
-    fontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), attributes->get()));
-    auto ctFont = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), *size, nullptr));
+    auto ctFont = createCTFont(attributes->get(), *size, *referenceURL, *postScriptName);
+    if (!ctFont)
+        return std::nullopt;
 
     return WebCore::FontPlatformData(ctFont.get(), *size, *syntheticBold, *syntheticOblique, *orientation, *widthVariant, *textRenderingMode);