Attachment 343666 Details for Bug 187075 – Patch

[patch] Patch

bug-187075-20180626175928.patch (text/plain), 2.42 KB, created by Jeremy Jones on 2018-06-26 17:59:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Jones

Created: 2018-06-26 17:59:29 PDT

Size: 2.42 KB

patch

obsolete

>Subversion Revision: 233214
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 766381d2e378d311a118d0724b7016db11b8eabc..b8b512dc6981af0da862fec4e84831a1b032f5e5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-26  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Crash when _topConstraint is null in element fullscreen.
>+        https://bugs.webkit.org/show_bug.cgi?id=187075
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        NSArray can't contain a null pointer, so check for null before creating an array from a pointer.
>+        Use the recommended +deactivateConstraints: instead of -removeConstraints:.
>+
>+        * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
>+        (-[WKFullScreenViewController showUI]):
>+        (-[WKFullScreenViewController hideUI]):
>+
> 2018-06-26  Eric Carlson  <eric.carlson@apple.com>
> 
>         [Mac] AirPlay picker uses incorrect theme in Dark mode
>diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>index cf71726614288b5dbffcea52d016e87b9240b2ae..f8f8e253e41a3ce2e897b74e53eec0cfb512cb40 100644
>--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>@@ -171,7 +171,8 @@ - (void)showUI
>         [_stackView setAlpha:1];
>         self.prefersStatusBarHidden = NO;
>         self.prefersHomeIndicatorAutoHidden = NO;
>-        [self.view removeConstraints:@[_topConstraint.get()]];
>+        if (_topConstraint)
>+            [NSLayoutConstraint deactivateConstraints:@[_topConstraint.get()]];
>         _topConstraint = [[_topGuide topAnchor] constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor];
>         [_topConstraint setActive:YES];
>         if (auto* manager = self._manager)
>@@ -184,7 +185,8 @@ - (void)hideUI
>     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hideUI) object:nil];
>     [UIView animateWithDuration:showHideAnimationDuration animations:^{
> 
>-        [self.view removeConstraints:@[_topConstraint.get()]];
>+        if (_topConstraint)
>+            [NSLayoutConstraint deactivateConstraints:@[_topConstraint.get()]];
>         _topConstraint = [[_topGuide topAnchor] constraintEqualToAnchor:self.view.topAnchor constant:self.view.safeAreaInsets.top];
>         [_topConstraint setActive:YES];
>         [_stackView setAlpha:0];

Actions: View | Formatted Diff | Diff

Attachments on bug 187075: 343666 | 343693