Diff
Modified: trunk/Source/WTF/ChangeLog (261087 => 261088)
--- trunk/Source/WTF/ChangeLog 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WTF/ChangeLog 2020-05-04 16:55:07 UTC (rev 261088)
@@ -1,3 +1,13 @@
+2020-05-04 Darin Adler <[email protected]>
+
+ Remove no-longer-needed HAVE(UISCENE)
+ https://bugs.webkit.org/show_bug.cgi?id=211376
+
+ Reviewed by Chris Dumez.
+
+ * wtf/PlatformHave.h: Don't define HAVE_UISCENE any more.
+ It's always true for PLATFORM(IOS_FAMILY).
+
2020-05-03 Mark Lam <[email protected]>
Remove some unused and broken functions in Bitmap.
Modified: trunk/Source/WTF/wtf/PlatformHave.h (261087 => 261088)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 16:55:07 UTC (rev 261088)
@@ -93,10 +93,6 @@
#define HAVE_VISIBILITY_PROPAGATION_VIEW 1
#endif
-#if !defined(HAVE_UISCENE) && PLATFORM(IOS_FAMILY)
-#define HAVE_UISCENE 1
-#endif
-
#if !defined(HAVE_AVSTREAMSESSION) && PLATFORM(MAC)
#define HAVE_AVSTREAMSESSION 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (261087 => 261088)
--- trunk/Source/WebKit/ChangeLog 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WebKit/ChangeLog 2020-05-04 16:55:07 UTC (rev 261088)
@@ -1,3 +1,21 @@
+2020-05-04 Darin Adler <[email protected]>
+
+ Remove no-longer-needed HAVE(UISCENE)
+ https://bugs.webkit.org/show_bug.cgi?id=211376
+
+ Reviewed by Chris Dumez.
+
+ * Platform/spi/ios/UIKitSPI.h: Don't check HAVE(UISCENE) any more in this
+ iOS-family-only source file; it's always true.
+ * UIProcess/ApplicationStateTracker.h: Ditto.
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::ApplicationStateTracker::ApplicationStateTracker): Ditto.
+ (WebKit::ApplicationStateTracker::~ApplicationStateTracker): Ditto.
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView interfaceOrientation]): Ditto.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView textEffectsWindow]): Ditto.
+
2020-05-04 Yusuke Suzuki <[email protected]>
Unreviewed, speculative build fix for r261071
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (261087 => 261088)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2020-05-04 16:55:07 UTC (rev 261088)
@@ -1072,9 +1072,7 @@
@interface UITextEffectsWindow : UIAutoRotatingWindow
+ (UITextEffectsWindow *)sharedTextEffectsWindow;
-#if HAVE(UISCENE)
+ (UITextEffectsWindow *)sharedTextEffectsWindowForWindowScene:(UIWindowScene *)windowScene;
-#endif // HAVE(UISCENE)
@end
@interface _UIVisualEffectLayerConfig : NSObject
Modified: trunk/Source/WebKit/UIProcess/ApplicationStateTracker.h (261087 => 261088)
--- trunk/Source/WebKit/UIProcess/ApplicationStateTracker.h 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WebKit/UIProcess/ApplicationStateTracker.h 2020-05-04 16:55:07 UTC (rev 261088)
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ApplicationStateTracker_h
-#define ApplicationStateTracker_h
+#pragma once
#if PLATFORM(IOS_FAMILY)
@@ -65,10 +64,8 @@
id m_didEnterBackgroundObserver;
id m_didFinishSnapshottingAfterEnteringBackgroundObserver;
id m_willEnterForegroundObserver;
-#if HAVE(UISCENE)
id m_willBeginSnapshotSequenceObserver;
id m_didCompleteSnapshotSequenceObserver;
-#endif
};
enum class ApplicationType {
@@ -83,5 +80,3 @@
}
#endif
-
-#endif // ApplicationStateTracker_h
Modified: trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm (261087 => 261088)
--- trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm 2020-05-04 16:55:07 UTC (rev 261088)
@@ -97,7 +97,6 @@
switch (applicationType(window)) {
case ApplicationType::Application: {
-#if HAVE(UISCENE)
m_isInBackground = window.windowScene.activationState == UISceneActivationStateBackground || window.windowScene.activationState == UISceneActivationStateUnattached;
RELEASE_LOG(ViewState, "%p - ApplicationStateTracker::ApplicationStateTracker(): m_isInBackground: %d", this, m_isInBackground);
@@ -122,20 +121,6 @@
m_didCompleteSnapshotSequenceObserver = [notificationCenter addObserverForName:_UISceneDidCompleteSystemSnapshotSequence object:nil queue:nil usingBlock:[this](NSNotification *notification) {
didCompleteSnapshotSequence();
}];
-#else
- m_isInBackground = application.applicationState == UIApplicationStateBackground;
- RELEASE_LOG(ViewState, "%p - ApplicationStateTracker::ApplicationStateTracker(): m_isInBackground: %d", this, m_isInBackground);
-
- m_didEnterBackgroundObserver = [notificationCenter addObserverForName:UIApplicationDidEnterBackgroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
- RELEASE_LOG(ViewState, "%p - ApplicationStateTracker: UIApplicationDidEnterBackground", this);
- applicationDidEnterBackground();
- }];
-
- m_willEnterForegroundObserver = [notificationCenter addObserverForName:UIApplicationWillEnterForegroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
- RELEASE_LOG(ViewState, "%p - ApplicationStateTracker: UIApplicationWillEnterForeground", this);
- applicationWillEnterForeground();
- }];
-#endif
break;
}
@@ -213,10 +198,8 @@
[notificationCenter removeObserver:m_didEnterBackgroundObserver];
[notificationCenter removeObserver:m_didFinishSnapshottingAfterEnteringBackgroundObserver];
[notificationCenter removeObserver:m_willEnterForegroundObserver];
-#if HAVE(UISCENE)
[notificationCenter removeObserver:m_willBeginSnapshotSequenceObserver];
[notificationCenter removeObserver:m_didCompleteSnapshotSequenceObserver];
-#endif
}
void ApplicationStateTracker::applicationDidEnterBackground()
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (261087 => 261088)
--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2020-05-04 16:55:07 UTC (rev 261088)
@@ -522,11 +522,7 @@
- (UIInterfaceOrientation)interfaceOrientation
{
-#if HAVE(UISCENE)
return self.window.windowScene.interfaceOrientation;
-#else
- return UIApp.interfaceOrientation;
-#endif
}
#pragma mark Internal
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (261087 => 261088)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-04 15:58:53 UTC (rev 261087)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-04 16:55:07 UTC (rev 261088)
@@ -7571,11 +7571,7 @@
- (UIView *)textEffectsWindow
{
-#if HAVE(UISCENE)
return [UITextEffectsWindow sharedTextEffectsWindowForWindowScene:self.window.windowScene];
-#else
- return [UITextEffectsWindow sharedTextEffectsWindow];
-#endif
}
- (NSDictionary *)_autofillContext
