Title: [203483] trunk/Source/WebKit2
Revision
203483
Author
simon.fra...@apple.com
Date
2016-07-20 17:36:12 -0700 (Wed, 20 Jul 2016)

Log Message

REGRESSION (r203189): Webpage snapshots are partially or fully blank when edge swiping back
https://bugs.webkit.org/show_bug.cgi?id=160000
rdar://problem/27455589

Reviewed by Zalan Bujtas.

r203189 triggered a call to -_updateContentRectsWithState: in the middle of a swipe,
during which we'd compute the visible rect of the view as having zero width, causing us
to not create tiles.

-_navigationGestureDidBegin already snapshots the visibleContentRect in _frozenVisibleContentRect,
but -_visibleContentRect then clipped that with ancestor views, causing the issue.

Fix by having -_visibleContentRect just return _frozenVisibleContentRect if we have one.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _visibleContentRect]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (203482 => 203483)


--- trunk/Source/WebKit2/ChangeLog	2016-07-21 00:23:19 UTC (rev 203482)
+++ trunk/Source/WebKit2/ChangeLog	2016-07-21 00:36:12 UTC (rev 203483)
@@ -1,3 +1,23 @@
+2016-07-20  Simon Fraser  <simon.fra...@apple.com>
+
+        REGRESSION (r203189): Webpage snapshots are partially or fully blank when edge swiping back
+        https://bugs.webkit.org/show_bug.cgi?id=160000
+        rdar://problem/27455589
+        
+        Reviewed by Zalan Bujtas.
+
+        r203189 triggered a call to -_updateContentRectsWithState: in the middle of a swipe,
+        during which we'd compute the visible rect of the view as having zero width, causing us
+        to not create tiles.
+
+        -_navigationGestureDidBegin already snapshots the visibleContentRect in _frozenVisibleContentRect,
+        but -_visibleContentRect then clipped that with ancestor views, causing the issue.
+
+        Fix by having -_visibleContentRect just return _frozenVisibleContentRect if we have one.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _visibleContentRect]):
+
 2016-07-20  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         [iPhone] Playing a video on tudou.com plays only sound, no video

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203482 => 203483)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2016-07-21 00:23:19 UTC (rev 203482)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2016-07-21 00:36:12 UTC (rev 203483)
@@ -1915,7 +1915,10 @@
 
 - (CGRect)_visibleContentRect
 {
-    CGRect visibleRectInContentCoordinates = _frozenVisibleContentRect ? _frozenVisibleContentRect.value() : [self convertRect:self.bounds toView:_contentView.get()];
+    if (_frozenVisibleContentRect)
+        return _frozenVisibleContentRect.value();
+
+    CGRect visibleRectInContentCoordinates = [self convertRect:self.bounds toView:_contentView.get()];
     
     if (UIScrollView *enclosingScroller = [self _scroller]) {
         CGRect viewVisibleRect = [self _visibleRectInEnclosingScrollView:enclosingScroller];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to