Changeset 261135 in webkit

Timestamp:

May 4, 2020 6:18:41 PM (4 years ago)

Author:

timothy_horton@apple.com

Message:

Unreviewed, reverting r261117.

Broke lots of API tests

Reverted changeset:

"Excessive error logging from daemons trying to use WebKit,
under -[UIDevice currentDevice]"
​https://bugs.webkit.org/show_bug.cgi?id=211397
​https://trac.webkit.org/changeset/261117

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/UserInterfaceIdiom.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-04  Timothy Horton  <timothy_horton@apple.com>
+
+        Unreviewed, reverting r261117.
+
+        Broke lots of API tests
+
+        Reverted changeset:
+
+        "Excessive error logging from daemons trying to use WebKit,
+        under -[UIDevice currentDevice]"
+        https://bugs.webkit.org/show_bug.cgi?id=211397
+        https://trac.webkit.org/changeset/261117
+
 2020-05-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm

@@ -29 +29 @@
 #if PLATFORM(IOS_FAMILY)
 
-#import "UIKitSPI.h"
-#import <WebCore/Device.h>
+#if USE(APPLE_INTERNAL_SDK)
+#import <UIKit/UIDevice_Private.h>
+#else
+#import <UIKit/UIDevice.h>
+#endif
 
 namespace WebKit {
@@ -42 +45 @@
 static UserInterfaceIdiomState userInterfaceIdiomIsPadState = UserInterfaceIdiomState::Unknown;
 
+#if PLATFORM(IOS_FAMILY)
 static inline bool userInterfaceIdiomIsPad()
 {
-    // If we are in a dameon, 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
@@ -59 +57 @@
 #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"
@@ -194 +193 @@
     _allowsPictureInPictureMediaPlayback = YES;
 #endif
-    _allowsInlineMediaPlayback = WebKit::currentUserInterfaceIdiomIsPad();
+    _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
     _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
     _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;