Attachment 348861 Details for Bug 189278 – Patch

[patch] Patch

bug-189278-20180904155747.patch (text/plain), 1.78 KB, created by Jeremy Jones on 2018-09-04 15:57:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Jones

Created: 2018-09-04 15:57:48 PDT

Size: 1.78 KB

patch

obsolete

>Subversion Revision: 235618
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index bf5ae182f65845d8d269f27b7421481f8baa3446..9a7149e75a9db434dc64582a9ebf0438efe2abfe 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-04  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Cancelled fullscreen exit gesture leaves bad state for next exit request.
>+        https://bugs.webkit.org/show_bug.cgi?id=189278
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
>+        (-[WKFullScreenWindowController _dismissFullscreenViewController]):
>+
> 2018-09-04  Frederic Wang  <fwang@igalia.com>
> 
>         Bug 189190 - REGRESSION(r235398) ASSERTION failure !m_client.didFinishDocumentLoadForFrame
>diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>index 1665c3ef423c31684ca46ffcf7f59531ef17ff88..4edd94bebcddb5040b0094fc487a5526e69250fe 100644
>--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>@@ -977,15 +977,12 @@ - (void)_dismissFullscreenViewController
>         if (![self._webView _page])
>             return;
> 
>-
>-        if (_interactiveDismissTransitionCoordinator.get().animator.context.transitionWasCancelled) {
>+        if (_interactiveDismissTransitionCoordinator.get().animator.context.transitionWasCancelled)
>             [_fullscreenViewController setAnimating:NO];
>-            return;
>-        }
>-
>+        else
>+            [self _completedExitFullScreen];
>+        
>         _interactiveDismissTransitionCoordinator = nil;
>-
>-        [self _completedExitFullScreen];
>     }];
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189278: 348861