Title: [263500] trunk/Source
- Revision
- 263500
- Author
- james.sav...@apple.com
- Date
- 2020-06-24 22:12:11 -0700 (Wed, 24 Jun 2020)
Log Message
Upstream iPadOS 13.0 multi-window support
https://bugs.webkit.org/show_bug.cgi?id=213590
Reviewed by Alexey Proskuryakov.
Source/WebCore:
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
(VideoFullscreenInterfaceAVKit::doSetup): Always construct a UIWindow
using the expected UIWindowScene.
(makeWindowFromView): Deleted.
Source/WebKit:
* UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
(-[WKFullScreenWindowController enterFullScreen]): Always construct a
UIWindow using the expected UIWindowScene.
(makeWindowFromView): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (263499 => 263500)
--- trunk/Source/WebCore/ChangeLog 2020-06-25 04:42:11 UTC (rev 263499)
+++ trunk/Source/WebCore/ChangeLog 2020-06-25 05:12:11 UTC (rev 263500)
@@ -1,3 +1,15 @@
+2020-06-24 James Savage <james.sav...@apple.com>
+
+ Upstream iPadOS 13.0 multi-window support
+ https://bugs.webkit.org/show_bug.cgi?id=213590
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+ (VideoFullscreenInterfaceAVKit::doSetup): Always construct a UIWindow
+ using the expected UIWindowScene.
+ (makeWindowFromView): Deleted.
+
2020-06-24 Wenson Hsieh <wenson_hs...@apple.com>
Running spellcheck on https://developer.apple.com/forums/thread/650317 hangs the web process
Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (263499 => 263500)
--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2020-06-25 04:42:11 UTC (rev 263499)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2020-06-25 05:12:11 UTC (rev 263500)
@@ -1250,17 +1250,6 @@
doExitFullscreen();
}
-#if !PLATFORM(WATCHOS)
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/VideoFullscreenInterfaceAVKitAdditions.mm>
-#else
-static RetainPtr<UIWindow> makeWindowFromView(UIView *)
-{
- return adoptNS([PAL::allocUIWindowInstance() initWithFrame:[[PAL::getUIScreenClass() mainScreen] bounds]]);
-}
-#endif
-#endif
-
void VideoFullscreenInterfaceAVKit::doSetup()
{
Mode changes { m_currentMode.mode() ^ m_targetMode.mode() };
@@ -1283,7 +1272,7 @@
#if !PLATFORM(WATCHOS)
if (![[m_parentView window] _isHostedInAnotherProcess] && !m_window) {
- m_window = makeWindowFromView(m_parentView.get());
+ m_window = adoptNS([PAL::allocUIWindowInstance() initWithWindowScene:[[m_parentView window] windowScene]]);
[m_window setBackgroundColor:clearUIColor()];
if (!m_viewController)
m_viewController = adoptNS([PAL::allocUIViewControllerInstance() init]);
Modified: trunk/Source/WebKit/ChangeLog (263499 => 263500)
--- trunk/Source/WebKit/ChangeLog 2020-06-25 04:42:11 UTC (rev 263499)
+++ trunk/Source/WebKit/ChangeLog 2020-06-25 05:12:11 UTC (rev 263500)
@@ -1,3 +1,15 @@
+2020-06-24 James Savage <james.sav...@apple.com>
+
+ Upstream iPadOS 13.0 multi-window support
+ https://bugs.webkit.org/show_bug.cgi?id=213590
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+ (-[WKFullScreenWindowController enterFullScreen]): Always construct a
+ UIWindow using the expected UIWindowScene.
+ (makeWindowFromView): Deleted.
+
2020-06-24 David Kilzer <ddkil...@apple.com>
Use ObjectIdentifier<>instead of WebCore::nextPlaybackTargetClientContextId() in Document.cpp
Modified: trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (263499 => 263500)
--- trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2020-06-25 04:42:11 UTC (rev 263499)
+++ trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2020-06-25 05:12:11 UTC (rev 263500)
@@ -490,15 +490,6 @@
#pragma mark -
#pragma mark External Interface
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKFullScreenWindowControllerIOSAdditions.mm>
-#else
-static RetainPtr<UIWindow> makeWindowFromView(UIView *)
-{
- return adoptNS([[UIWindow alloc] init]);
-}
-#endif
-
- (void)enterFullScreen
{
if ([self isFullScreen])
@@ -514,7 +505,7 @@
_fullScreenState = WebKit::WaitingToEnterFullScreen;
- _window = makeWindowFromView(webView.get());
+ _window = adoptNS([[UIWindow alloc] initWithWindowScene:[[webView window] windowScene]]);
[_window setBackgroundColor:[UIColor clearColor]];
[_window setWindowLevel:UIWindowLevelNormal - 1];
[_window setHidden:NO];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
