Changeset 259746 in webkit

Timestamp:

Apr 8, 2020, 12:59:17 PM (6 years ago)

Author:

Wenson Hsieh

Message:

Remove a workaround that allows many API tests to pass on iOS 13.2
​https://bugs.webkit.org/show_bug.cgi?id=209709

Reviewed by Megan Gardner.

Removes a workaround added in r256297 to get API tests passing on iOS 13.2. This workaround swizzled
-[NSBundle bundleIdentifier] to return a non-null string, in order to avoid a crash introduced by
<rdar://problem/56301207>. This was subsequently fixed in <rdar://problem/56790195>, which has made its way
into iOS 13.4.

• TestWebKitAPI/cocoa/TestWKWebView.mm:

(+[WKWebView initialize]): Deleted.

• TestWebKitAPI/ios/UIKitSPI.h:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-08  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Remove a workaround that allows many API tests to pass on iOS 13.2
+        https://bugs.webkit.org/show_bug.cgi?id=209709
+
+        Reviewed by Megan Gardner.
+
+        Removes a workaround added in r256297 to get API tests passing on iOS 13.2. This workaround swizzled
+        `-[NSBundle bundleIdentifier]` to return a non-null string, in order to avoid a crash introduced by
+        <rdar://problem/56301207>. This was subsequently fixed in <rdar://problem/56790195>, which has made its way
+        into iOS 13.4.
+
+        * TestWebKitAPI/cocoa/TestWKWebView.mm:
+        (+[WKWebView initialize]): Deleted.
+        * TestWebKitAPI/ios/UIKitSPI.h:
+
 2020-04-08  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm

@@ -72 +72 @@
 @implementation WKWebView (TestWebKitAPI)
 
-#if PLATFORM(IOS_FAMILY)
-
-+ (void)initialize
-{
-    // FIXME: This hack should no longer be necessary on builds that have the fix for <rdar://problem/56790195>.
-    // Calling +displayIdentifier will guarantee a call to an internal UIKit helper method that caches the fake
-    // bundle name "com.apple.TestWebKitAPI" for the rest of the process' lifetime. This allows us to avoid crashing
-    // under -[UIScrollView setContentOffset:animated:] due to telemetry code that requires a bundle identifier.
-    // Note that this swizzling is temporary, since unconditionally swizzling -[NSBundle bundleIdentifier] for the
-    // entirely of the test causes other tests to fail or time out.
-    InstanceMethodSwizzler bundleIdentifierSwizzler(NSBundle.class, @selector(bundleIdentifier), reinterpret_cast<IMP>(overrideBundleIdentifier));
-    [UIApplication displayIdentifier];
-}
-
-#endif // PLATFORM(IOS_FAMILY)
-
 - (void)loadTestPageNamed:(NSString *)pageName
 {

trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h

@@ -269 +269 @@
 @end
 
-@interface UIApplication (Internal)
-+ (NSString *)displayIdentifier;
-@end
-
 #endif // PLATFORM(IOS_FAMILY)