Attachment 368990 Details for Bug 197578 – Patch

[patch] Patch

bug-197578-20190503143213.patch (text/plain), 4.15 KB, created by James Savage on 2019-05-03 14:32:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Savage

Created: 2019-05-03 14:32:15 PDT

Size: 4.15 KB

patch

obsolete

>Subversion Revision: 244898
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index af347836d9e6fae8beb7509eec4d23c258853ca8..58e2a93136796f3e44eaa822a0cc727840b6fb37 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-03  James Savage  <james.savage@apple.com>
>+
>+        Improve coordination for creating UIWindow instances
>+        https://bugs.webkit.org/show_bug.cgi?id=197578
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
>+        (makeWindowFromView): Pull out window creation.
>+        (VideoFullscreenInterfaceAVKit::doSetup): Call new helper function.
>+
> 2019-05-02  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Disable software keyboard for a math field textarea on desmos.com
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ad5a964dab4c1980e669bcd77f1286b46c753b4d..bd7c51b228378c4e445734f5001dfac6b83b73a3 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-03  James Savage  <james.savage@apple.com>
>+
>+        Improve coordination for creating UIWindow instances
>+        https://bugs.webkit.org/show_bug.cgi?id=197578
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
>+        (makeWindowFromView): Pull out window creation.
>+        (-[WKFullScreenWindowController enterFullScreen]): Call new helper function.
>+
> 2019-05-02  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         REGRESSION: Layout test editing/selection/ios/selection-after-changing-text-with-callout-menu.html is failing
>diff --git a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>index 03ce20c90273378f4e862a82edf9d18e6c12442b..f11f9d83f18eea2db9d915938e61bd36ad072822 100644
>--- a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>+++ b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>@@ -1174,6 +1174,15 @@ void VideoFullscreenInterfaceAVKit::setInlineRect(const IntRect& inlineRect, boo
>         doExitFullscreen();
> }
> 
>+#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()
> {
>     Mode changes { m_currentMode.mode() ^ m_targetMode.mode() };
>@@ -1196,8 +1205,7 @@ void VideoFullscreenInterfaceAVKit::doSetup()
> 
> #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)
>             m_viewController = adoptNS([PAL::allocUIViewControllerInstance() init]);
>diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>index 0078021fb852e7399df71cbd89255268f16e2100..360b7886b6a34f3dd5c5d8273ce8e89ff7f0dd14 100644
>--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>@@ -489,6 +489,15 @@ - (UIView *)webViewPlaceholder
> #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])
>@@ -504,7 +513,7 @@ - (void)enterFullScreen
> 
>     _fullScreenState = WebKit::WaitingToEnterFullScreen;
> 
>-    _window = adoptNS([[UIWindow alloc] init]);
>+    _window = makeWindowFromView(webView);
>     [_window setBackgroundColor:[UIColor clearColor]];
>     [_window setWindowLevel:UIWindowLevelNormal - 1];
>     [_window setHidden:NO];

Actions: View | Formatted Diff | Diff

Attachments on bug 197578: 368990 | 368991 | 369039 | 369204