Attachment 340604 Details for Bug 185736 – Patch for Landing

[patch] Patch for Landing

bug-185736-20180517110013.patch (text/plain), 2.58 KB, created by Jeremy Jones on 2018-05-17 11:00:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Jones

Created: 2018-05-17 11:00:13 PDT

Size: 2.58 KB

patch

obsolete

>Subversion Revision: 231157
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b45b9c8b7b0bf1893057b858c851d46fbe2c2b68..fe88d12ae0ddc3158b486f69504c6d6af82b5c28 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-17  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Ensure valid rects for fullsceen animation.
>+        https://bugs.webkit.org/show_bug.cgi?id=185736
>+        rdar://problem/40320174
>+
>+        Reviewed by Jer Noble.
>+
>+        Protect against zero width and height since those can make for NANs in the animation transforms.
>+
>+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
>+        (-[WKFullScreenWindowController beganEnterFullScreenWithInitialFrame:finalFrame:]):
>+        (-[WKFullScreenWindowController beganExitFullScreenWithInitialFrame:finalFrame:]):
>+
> 2018-04-30  Andy Estes  <aestes@apple.com>
> 
>         [iOS] Try to unlock PDF documents before printing them
>diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>index b3de4ddd94a9caa321b68f8103130c0622d55e64..950b155f8d784a1dae069ea2f804707d25dd6465 100644
>--- a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>@@ -59,6 +59,11 @@ SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(LinkPresentation)
> 
> namespace WebKit {
> 
>+static CGSize sizeExpandedToSize(CGSize initial, CGSize other)
>+{
>+    return CGSizeMake(std::max(initial.width, other.width),  std::max(initial.height, other.height));
>+}
>+
> static void replaceViewWithView(UIView *view, UIView *otherView)
> {
>     [CATransaction begin];
>@@ -502,7 +507,10 @@ - (void)beganEnterFullScreenWithInitialFrame:(CGRect)initialFrame finalFrame:(CG
> 
>     _initialFrame = initialFrame;
>     _finalFrame = finalFrame;
>-
>+    
>+    _initialFrame.size = sizeExpandedToSize(_initialFrame.size, CGSizeMake(1, 1));
>+    _finalFrame.size = sizeExpandedToSize(_finalFrame.size, CGSizeMake(1, 1));
>+    
>     [CATransaction begin];
>     [CATransaction setDisableActions:YES];
> 
>@@ -568,6 +576,9 @@ - (void)beganExitFullScreenWithInitialFrame:(CGRect)initialFrame finalFrame:(CGR
>     _initialFrame = initialFrame;
>     _finalFrame = finalFrame;
>     
>+    _initialFrame.size = sizeExpandedToSize(_initialFrame.size, CGSizeMake(1, 1));
>+    _finalFrame.size = sizeExpandedToSize(_finalFrame.size, CGSizeMake(1, 1));
>+    
>     [_webView _page]->setSuppressVisibilityUpdates(true);
> 
>     [_fullscreenViewController setPrefersStatusBarHidden:NO];

Actions: View | Formatted Diff | Diff

Attachments on bug 185736: 340599 | 340604 | 340618