Changeset 261157 in webkit

Timestamp:

May 5, 2020 2:03:21 AM (4 years ago)

Author:

timothy_horton@apple.com

Message:

Excessive error logging from daemons trying to use WebKit, under -[UIDevice currentDevice]
​https://bugs.webkit.org/show_bug.cgi?id=211397
<rdar://problem/61635403>

Reviewed by Simon Fraser.

Source/WebKit:

• Shared/UserInterfaceIdiom.mm:

(WebKit::userInterfaceIdiomIsPad):
Adjust userInterfaceIdiomIsPad so that in daemons, it consults only MobileGestalt,
which returns the actual hardware model, and does not try to use UIDevice.
UIDevice is more accurate for applications because it will report that
the device is an iPhone when called inside an iPhone app running on iPad,
but it cannot be used in daemons that do not have a UIApplication.

For the behaviors we gate on this bit, it makes sense to use iPhone
behaviors on iPad in the iPhone app jail, so we continue using
UIDevice if possible.

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration init]):
Make use of the new mechanism instead of going straight to MobileGestalt,
for the aforementioned reasons.

Tools:

• TestWebKitAPI/ios/UserInterfaceSwizzler.h:

We need a UIApplication or WebKit won't look at UIDevice.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/UserInterfaceIdiom.mm (modified) (3 diffs)
• Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/ios/UserInterfaceSwizzler.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-05  Tim Horton  <timothy_horton@apple.com>
+
+        Excessive error logging from daemons trying to use WebKit, under -[UIDevice currentDevice]
+        https://bugs.webkit.org/show_bug.cgi?id=211397
+        <rdar://problem/61635403>
+
+        Reviewed by Simon Fraser.
+
+        * Shared/UserInterfaceIdiom.mm:
+        (WebKit::userInterfaceIdiomIsPad):
+        Adjust userInterfaceIdiomIsPad so that in daemons, it consults only MobileGestalt,
+        which returns the actual hardware model, and does not try to use UIDevice.
+        UIDevice is more accurate for applications because it will report that
+        the device is an iPhone when called inside an iPhone app running on iPad,
+        but it cannot be used in daemons that do not have a UIApplication.
+        
+        For the behaviors we gate on this bit, it makes sense to use iPhone
+        behaviors on iPad in the iPhone app jail, so we continue using
+        UIDevice if possible.
+
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration init]):
+        Make use of the new mechanism instead of going straight to MobileGestalt,
+        for the aforementioned reasons.
+
 2020-05-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm

@@ -29 +29 @@
 #if PLATFORM(IOS_FAMILY)
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <UIKit/UIDevice_Private.h>
-#else
-#import <UIKit/UIDevice.h>
-#endif
+#import "UIKitSPI.h"
+#import <WebCore/Device.h>
 
 namespace WebKit {
@@ -45 +42 @@
 static UserInterfaceIdiomState userInterfaceIdiomIsPadState = UserInterfaceIdiomState::Unknown;
 
-#if PLATFORM(IOS_FAMILY)
 static inline bool userInterfaceIdiomIsPad()
 {
+    // If we are in a daemon, we cannot use UIDevice. Fall back to checking the hardware itself.
+    // Since daemons don't ever run in an iPhone-app-on-iPad jail, this will be accurate in the daemon case,
+    // but is not sufficient in the application case.
+    if (![UIApplication sharedApplication])
+        return WebCore::deviceClass() == MGDeviceClassiPad;
+
     // This inline function exists to thwart unreachable code
     // detection on platforms where UICurrentUserInterfaceIdiomIsPad
@@ -57 +59 @@
 #endif
 }
-#endif
 
 bool currentUserInterfaceIdiomIsPad()

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -28 +28 @@
 
 #import "APIPageConfiguration.h"
+#import "UserInterfaceIdiom.h"
 #import "VersionChecks.h"
 #import "WKPreferences.h"
@@ -193 +194 @@
     _allowsPictureInPictureMediaPlayback = YES;
 #endif
-    _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
+    _allowsInlineMediaPlayback = WebKit::currentUserInterfaceIdiomIsPad();
     _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
     _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;

trunk/Tools/ChangeLog

@@ +1 @@
+2020-05-05  Tim Horton  <timothy_horton@apple.com>
+
+        Excessive error logging from daemons trying to use WebKit, under -[UIDevice currentDevice]
+        https://bugs.webkit.org/show_bug.cgi?id=211397
+        <rdar://problem/61635403>
+
+        Reviewed by Simon Fraser.
+
+        * TestWebKitAPI/ios/UserInterfaceSwizzler.h:
+        We need a UIApplication or WebKit won't look at UIDevice.
+
 2020-05-04  Darin Adler  <darin@apple.com>
 

trunk/Tools/TestWebKitAPI/ios/UserInterfaceSwizzler.h

@@ -29 +29 @@
 
 #import "InstanceMethodSwizzler.h"
+#import "UIKitSPI.h"
 #import <UIKit/UIKit.h>
 
@@ -39 +40 @@
         : InstanceMethodSwizzler { UIDevice.class, @selector(userInterfaceIdiom), reinterpret_cast<IMP>(effectiveUserInterfaceIdiom) }
     {
+        if (!UIApplication.sharedApplication) {
+            UIApplicationInitialize();
+            UIApplicationInstantiateSingleton(UIApplication.class);
+        }
     }