Changeset 250640 in webkit

Timestamp:

Oct 2, 2019 5:53:31 PM (5 years ago)

Author:

mmaxfield@apple.com

Message:

REGRESSION (r245672): <select> dropdown with text-rendering: optimizeLegibility freezes Safari
​https://bugs.webkit.org/show_bug.cgi?id=202198

Reviewed by Tim Horton.

Source/WebKit:

NSFont has a bug where passing "auto" to kCTFontOpticalSizeAttribute
causes an exception to be thrown. We don't catch the exception, so we
pop up back to the runloop, which confuses the UI process.

The solution is twofold: 1) Workaround the bug by passing the font size
to kCTFontOpticalSizeAttribute instead, and 2) catch any exceptions that
this part of the code might throw.

• UIProcess/mac/WebPopupMenuProxyMac.mm:

(WebKit::WebPopupMenuProxyMac::showPopupMenu):

Source/WTF:

• wtf/Platform.h:

LayoutTests:

• fast/forms/select-font-optical-size-expected.txt: Added.
• fast/forms/select-font-optical-size.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/select-font-optical-size-expected.txt (added)
• LayoutTests/fast/forms/select-font-optical-size.html (added)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/Platform.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-10-02  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION (r245672): <select> dropdown with text-rendering: optimizeLegibility freezes Safari
+        https://bugs.webkit.org/show_bug.cgi?id=202198
+
+        Reviewed by Tim Horton.
+
+        * fast/forms/select-font-optical-size-expected.txt: Added.
+        * fast/forms/select-font-optical-size.html: Added.
+
 2019-10-02  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-10-02  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION (r245672): <select> dropdown with text-rendering: optimizeLegibility freezes Safari
+        https://bugs.webkit.org/show_bug.cgi?id=202198
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+
 2019-10-02  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1599 +1599 @@
 #endif
 
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000)
+#define HAVE_NSFONT_WITH_OPTICAL_SIZING_BUG 1
+#endif
+
 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000 || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #define HAVE_APP_SSO 1

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-02  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION (r245672): <select> dropdown with text-rendering: optimizeLegibility freezes Safari
+        https://bugs.webkit.org/show_bug.cgi?id=202198
+
+        Reviewed by Tim Horton.
+
+        NSFont has a bug where passing "auto" to kCTFontOpticalSizeAttribute
+        causes an exception to be thrown. We don't catch the exception, so we
+        pop up back to the runloop, which confuses the UI process.
+
+        The solution is twofold: 1) Workaround the bug by passing the font size
+        to kCTFontOpticalSizeAttribute instead, and 2) catch any exceptions that
+        this part of the code might throw.
+
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+
 2019-10-02  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm

@@ -34 +34 @@
 #import "StringUtilities.h"
 #import "WebPopupItem.h"
+#import <pal/spi/cocoa/CoreTextSPI.h>
 #import <pal/system/mac/PopupMenu.h>
+#import <wtf/BlockObjCExceptions.h>
 #import <wtf/ProcessPrivilege.h>
 
@@ -101 +103 @@
     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
     NSFont *font;
+
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     if (data.fontInfo.fontAttributeDictionary) {
-        NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:(__bridge NSDictionary *)data.fontInfo.fontAttributeDictionary.get()];
+        RetainPtr<NSMutableDictionary> mutableDictionary = adoptNS([(__bridge NSDictionary *)data.fontInfo.fontAttributeDictionary.get() mutableCopy]);
+#if HAVE(NSFONT_WITH_OPTICAL_SIZING_BUG)
+        if (id opticalSizeAttribute = [mutableDictionary objectForKey:(__bridge NSString *)kCTFontOpticalSizeAttribute]) {
+            if ([opticalSizeAttribute isKindOfClass:[NSString class]]) {
+                [mutableDictionary removeObjectForKey:(__bridge NSString *)kCTFontOpticalSizeAttribute];
+                if (NSNumber *size = [mutableDictionary objectForKey:(__bridge NSString *)kCTFontSizeAttribute])
+                    [mutableDictionary setObject:size forKey:(__bridge NSString *)kCTFontOpticalSizeAttribute];
+            }
+        }
+#endif
+        NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:mutableDictionary.get()];
         font = [NSFont fontWithDescriptor:fontDescriptor size:((pageScaleFactor != 1) ? [fontDescriptor pointSize] * pageScaleFactor : 0)];
     } else
         font = [NSFont menuFontOfSize:0];
+    
+    END_BLOCK_OBJC_EXCEPTIONS
 
     populate(items, font, textDirection);