Changeset 238380 in webkit

Timestamp:

Nov 19, 2018 1:37:00 PM (5 years ago)

Author:

Wenson Hsieh

Message:

[iOS Debug] Assertion failure in NSComparisonResult UIContentSizeCategoryCompareToCategory()
​https://bugs.webkit.org/show_bug.cgi?id=190401
<rdar://problem/45195285>

Reviewed by Dean Jackson.

Work around sporadic UIKit assertions when running API tests that may present a UICalloutBar. Currently, UIKit
asks for the UIApp’s -preferredContentSizeCategory when showing or laying out the callout bar. However,
TestWebKitAPI lacks a UIApp altogether, and forcing one to be initialized via UIApplicationInstantiateSingleton
causes numerous other UIKit and WebKit assertions to be hit.

In lieu of TestWebKitAPI becoming a real UI application (see ​https://webkit.org/b/175204), simply don't allow
the callout bar to be initialized in TestWKWebView-based API tests. This encompasses all API tests which
have some chance of causing the callout bar to be shown by making a ranged text selections during the test.

• TestWebKitAPI/cocoa/TestWKWebView.mm:

(suppressUICalloutBar):
(-[TestWKWebView initWithFrame:configuration:addToWindow:]):

• TestWebKitAPI/ios/UIKitSPI.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/cocoa/TestWKWebView.mm (modified) (4 diffs)
• TestWebKitAPI/ios/UIKitSPI.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-19  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS Debug] Assertion failure in NSComparisonResult UIContentSizeCategoryCompareToCategory()
+        https://bugs.webkit.org/show_bug.cgi?id=190401
+        <rdar://problem/45195285>
+
+        Reviewed by Dean Jackson.
+
+        Work around sporadic UIKit assertions when running API tests that may present a UICalloutBar. Currently, UIKit
+        asks for the `UIApp`’s `-preferredContentSizeCategory` when showing or laying out the callout bar. However,
+        TestWebKitAPI lacks a UIApp altogether, and forcing one to be initialized via `UIApplicationInstantiateSingleton`
+        causes numerous other UIKit and WebKit assertions to be hit.
+
+        In lieu of TestWebKitAPI becoming a real UI application (see https://webkit.org/b/175204), simply don't allow
+        the callout bar to be initialized in TestWKWebView-based API tests. This encompasses all API tests which
+        have some chance of causing the callout bar to be shown by making a ranged text selections during the test.
+
+        * TestWebKitAPI/cocoa/TestWKWebView.mm:
+        (suppressUICalloutBar):
+        (-[TestWKWebView initWithFrame:configuration:addToWindow:]):
+        * TestWebKitAPI/ios/UIKitSPI.h:
+
 2018-11-19  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm

@@ -29 +29 @@
 #if WK_API_ENABLED
 
+#import "ClassMethodSwizzler.h"
 #import "TestNavigationDelegate.h"
 #import "Utilities.h"
@@ -186 +187 @@
     RetainPtr<TestWKWebViewHostWindow> _hostWindow;
     RetainPtr<TestMessageHandler> _testHandler;
+#if PLATFORM(IOS_FAMILY)
+    std::unique_ptr<TestWebKitAPI::ClassMethodSwizzler> _sharedCalloutBarSwizzler;
+#endif
 }
 
@@ -198 +202 @@
     return [self initWithFrame:frame configuration:configuration addToWindow:YES];
 }
+
+#if PLATFORM(IOS_FAMILY)
+
+static UICalloutBar *suppressUICalloutBar()
+{
+    return nil;
+}
+
+#endif
 
 - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration addToWindow:(BOOL)addToWindow
@@ -207 +220 @@
     if (addToWindow)
         [self _setUpTestWindow:frame];
+
+#if PLATFORM(IOS_FAMILY)
+    // FIXME: Remove this workaround once <https://webkit.org/b/175204> is fixed.
+    _sharedCalloutBarSwizzler = std::make_unique<TestWebKitAPI::ClassMethodSwizzler>([UICalloutBar class], @selector(sharedCalloutBar), reinterpret_cast<IMP>(suppressUICalloutBar));
+#endif
 
     return self;

trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h

@@ -31 +31 @@
 
 #import <UIKit/UIApplication_Private.h>
+#import <UIKit/UICalloutBar.h>
 #import <UIKit/UIKeyboard_Private.h>
 #import <UIKit/UIResponder_Private.h>
@@ -98 +99 @@
 @end
 
+@interface UICalloutBar : UIView
++ (UICalloutBar *)sharedCalloutBar;
+@end
+
 #if ENABLE(DRAG_SUPPORT)
 @protocol UIDragInteractionDelegate_Proposed_SPI_33146803 <UIDragInteractionDelegate>