Changeset 245000 in webkit

Timestamp:

May 6, 2019 8:51:58 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Improve coordination for creating UIWindow instances.
​https://bugs.webkit.org/show_bug.cgi?id=197578.
<rdar://problem/50456965>.

Patch by James Savage <James Savage> on 2019-05-06
Reviewed by Wenson Hsieh.

Source/WebCore:

• platform/ios/VideoFullscreenInterfaceAVKit.mm:

(makeWindowFromView): Pull out window creation.
(VideoFullscreenInterfaceAVKit::doSetup): Call new helper function.

Source/WebKit:

• UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:

(makeWindowFromView): Pull out window creation.
(-[WKFullScreenWindowController enterFullScreen]): Call new helper function.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-06  James Savage  <james.savage@apple.com>
+
+        Improve coordination for creating UIWindow instances.
+        https://bugs.webkit.org/show_bug.cgi?id=197578.
+        <rdar://problem/50456965>.
+
+        Reviewed by Wenson Hsieh.
+
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        (makeWindowFromView): Pull out window creation.
+        (VideoFullscreenInterfaceAVKit::doSetup): Call new helper function.
+
 2019-05-06  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

@@ -1175 +1175 @@
 }
 
+#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
+
 void VideoFullscreenInterfaceAVKit::doSetup()
 {
@@ -1197 +1206 @@
 #if !PLATFORM(WATCHOS)
     if (![[m_parentView window] _isHostedInAnotherProcess] && !m_window) {
-        if (!m_window)
-            m_window = adoptNS([PAL::allocUIWindowInstance() initWithFrame:[[PAL::getUIScreenClass() mainScreen] bounds]]);
+        m_window = makeWindowFromView(m_parentView.get());
         [m_window setBackgroundColor:clearUIColor()];
         if (!m_viewController)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-06  James Savage  <james.savage@apple.com>
+
+        Improve coordination for creating UIWindow instances.
+        https://bugs.webkit.org/show_bug.cgi?id=197578.
+        <rdar://problem/50456965>.
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+        (makeWindowFromView): Pull out window creation.
+        (-[WKFullScreenWindowController enterFullScreen]): Call new helper function.
+
 2019-05-06  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm

@@ -490 +490 @@
 #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
 {
@@ -505 +514 @@
     _fullScreenState = WebKit::WaitingToEnterFullScreen;
 
-    _window = adoptNS([[UIWindow alloc] init]);
+    _window = makeWindowFromView(webView.get());
     [_window setBackgroundColor:[UIColor clearColor]];
     [_window setWindowLevel:UIWindowLevelNormal - 1];