Attachment 343373 Details for Bug 186942 – Patch for landing

[patch] Patch for landing

bug-186942-20180622150850.patch (text/plain), 4.18 KB, created by Jer Noble on 2018-06-22 15:08:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-06-22 15:08:51 PDT

Size: 4.18 KB

patch

obsolete

>Subversion Revision: 233096
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 494bdbb57b7a411b104b542f780843082974900e..9926d4e4be8ef20ae775c66aaa13e1be01385156 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-22  Jer Noble  <jer.noble@apple.com>
>+
>+        [Fullscreen] Home indicator should show and hide with status bar
>+        https://bugs.webkit.org/show_bug.cgi?id=186942
>+        <rdar://problem/41302190>
>+
>+        Reviewed by Tim Horton.
>+
>+        * UIProcess/ios/fullscreen/WKFullScreenViewController.h:
>+        * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
>+        (-[WKFullScreenViewController showUI]):
>+        (-[WKFullScreenViewController hideUI]):
>+        (-[WKFullScreenViewController setPrefersHomeIndicatorAutoHidden:]):
>+
> 2018-06-19  Jer Noble  <jer.noble@apple.com>
> 
>         [Fullscreen] Add a pinch-to-exit gesture
>diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.h b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.h
>index c2f6d8b7a2fb781214b8601edcacee3b99e47d40..0fe7f7668b36ea4edf98f1b6f89d1d750520c83b 100644
>--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.h
>+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.h
>@@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
> @property (assign, nonatomic) SEL action;
> @property (copy, nonatomic) NSString *location;
> @property (assign, nonatomic) BOOL prefersStatusBarHidden;
>+@property (assign, nonatomic) BOOL prefersHomeIndicatorAutoHidden;
> @property (assign, nonatomic, getter=isPlaying) BOOL playing;
> @property (assign, nonatomic, getter=isPictureInPictureActive) BOOL pictureInPictureActive;
> @property (assign, nonatomic, getter=isAnimating) BOOL animating;
>diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>index 6dce47b8a8daf3af27505bc30c8c78e646d502c1..cf71726614288b5dbffcea52d016e87b9240b2ae 100644
>--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>@@ -119,6 +119,9 @@ @implementation WKFullScreenViewController {
>     CGFloat _nonZeroStatusBarHeight;
> }
> 
>+@synthesize prefersStatusBarHidden=_prefersStatusBarHidden;
>+@synthesize prefersHomeIndicatorAutoHidden=_prefersHomeIndicatorAutoHidden;
>+
> #pragma mark - External Interface
> 
> - (id)initWithWebView:(WKWebView *)webView
>@@ -167,6 +170,7 @@ - (void)showUI
>         [_stackView setHidden:NO];
>         [_stackView setAlpha:1];
>         self.prefersStatusBarHidden = NO;
>+        self.prefersHomeIndicatorAutoHidden = NO;
>         [self.view removeConstraints:@[_topConstraint.get()]];
>         _topConstraint = [[_topGuide topAnchor] constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor];
>         [_topConstraint setActive:YES];
>@@ -179,11 +183,13 @@ - (void)hideUI
> {
>     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hideUI) object:nil];
>     [UIView animateWithDuration:showHideAnimationDuration animations:^{
>+
>         [self.view removeConstraints:@[_topConstraint.get()]];
>         _topConstraint = [[_topGuide topAnchor] constraintEqualToAnchor:self.view.topAnchor constant:self.view.safeAreaInsets.top];
>         [_topConstraint setActive:YES];
>         [_stackView setAlpha:0];
>         self.prefersStatusBarHidden = YES;
>+        self.prefersHomeIndicatorAutoHidden = YES;
>         if (auto* manager = self._manager)
>             manager->setFullscreenControlsHidden(true);
>     } completion:^(BOOL finished) {
>@@ -206,8 +212,6 @@ - (void)videoControlsManagerDidChange
>     [_pipButton setHidden:!playbackSessionModel];
> }
> 
>-@synthesize prefersStatusBarHidden=_prefersStatusBarHidden;
>-
> - (void)setPrefersStatusBarHidden:(BOOL)value
> {
>     _prefersStatusBarHidden = value;
>@@ -215,6 +219,12 @@ - (void)setPrefersStatusBarHidden:(BOOL)value
>     [self _updateWebViewFullscreenInsets];
> }
> 
>+- (void)setPrefersHomeIndicatorAutoHidden:(BOOL)value
>+{
>+    _prefersHomeIndicatorAutoHidden = value;
>+    [self setNeedsUpdateOfHomeIndicatorAutoHidden];
>+}
>+
> - (void)setPlaying:(BOOL)isPlaying
> {
>     if (_playing == isPlaying)

Actions: View | Formatted Diff | Diff

Attachments on bug 186942: 343365 | 343373