Changeset 220788 in webkit

Timestamp:

Aug 16, 2017, 12:49:32 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220286. rdar://problem/33904738

Location:

branches/safari-604-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (9 diffs)
• UIProcess/API/Cocoa/WKWebViewInternal.h (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• UIProcess/API/wpe/PageClientImpl.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)
• UIProcess/mac/PageClientImpl.h (modified) (1 diff)

branches/safari-604-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-15  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220286. rdar://problem/33904738
+
+    2017-08-04  Tim Horton  <timothy_horton@apple.com>
+
+            viewport-fit changes during animated resize can cause layout size to get stuck
+            https://bugs.webkit.org/show_bug.cgi?id=175169
+            <rdar://problem/33684697>
+
+            Reviewed by Simon Fraser.
+
+            If we get a commit that changes viewport-fit state while an animated
+            resize is underway, and that change causes the client to push a new
+            minimumLayoutSizeOverride, the new size will be lost forever, and we
+            will get stuck laying out at the wrong size.
+
+            This is because we unconditionally apply avoidsUnsafeArea for every commit,
+            while most other changes that come in from a commit are ignored if we're
+            inside animated resize. To fix, also ignore avoidsUnsafeArea changes during
+            animated resize, by moving the code that keeps track of it into WKWebView
+            like all of the rest, and read it out of the commit in didCommitLayerTree
+            *after* the animated-resize early-return.
+
+            Also, fix the associated layout tests by adding a missing assignment
+            in _computedContentInset, which was broken in r220138.
+
+            * UIProcess/API/Cocoa/WKWebView.mm:
+            (-[WKWebView _initializeWithConfiguration:]):
+            (-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
+            (-[WKWebView _processDidExit]):
+            (-[WKWebView _didCommitLayerTree:]):
+            (-[WKWebView _setAvoidsUnsafeArea:]):
+            (-[WKWebView _safeAreaShouldAffectObscuredInsets]):
+            (-[WKWebView _didChangeAvoidsUnsafeArea:]): Deleted.
+            * UIProcess/API/Cocoa/WKWebViewInternal.h:
+            * UIProcess/PageClient.h:
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::resetState):
+            (WebKit::WebPageProxy::setAvoidsUnsafeArea): Deleted.
+            * UIProcess/WebPageProxy.h:
+            (WebKit::WebPageProxy::avoidsUnsafeArea const): Deleted.
+            * UIProcess/ios/PageClientImplIOS.h:
+            * UIProcess/ios/PageClientImplIOS.mm:
+            (WebKit::PageClientImpl::didChangeAvoidsUnsafeArea): Deleted.
+            * UIProcess/ios/WebPageProxyIOS.mm:
+            (WebKit::WebPageProxy::didCommitLayerTree):
+
 2017-08-13  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -248 +248 @@
     UIEdgeInsets _unobscuredSafeAreaInsets;
     BOOL _haveSetUnobscuredSafeAreaInsets;
+    BOOL _avoidsUnsafeArea;
     UIRectEdge _obscuredInsetEdgesAffectedBySafeArea;
 
@@ -525 +526 @@
     [_scrollView setBouncesZoom:YES];
 
+    _avoidsUnsafeArea = YES;
     [self _updateScrollViewInsetAdjustmentBehavior];
 
@@ -1270 +1272 @@
         [_scrollView setContentOffset:[self _adjustedContentOffset:CGPointZero]];
 
-        [self _didChangeAvoidsUnsafeArea:NO];
+        [self _setAvoidsUnsafeArea:NO];
     } else if (_customContentView) {
         [_customContentView removeFromSuperview];
@@ -1284 +1286 @@
         [_customContentFixedOverlayView setFrame:self.bounds];
         [self addSubview:_customContentFixedOverlayView.get()];
-
-        [self _didChangeAvoidsUnsafeArea:_page->avoidsUnsafeArea()];
     }
 
@@ -1409 +1409 @@
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     if (self._safeAreaShouldAffectObscuredInsets)
-        UIEdgeInsetsAdd(insets, [_scrollView _systemContentInset], self._effectiveObscuredInsetEdgesAffectedBySafeArea);
+        insets = UIEdgeInsetsAdd(insets, [_scrollView _systemContentInset], self._effectiveObscuredInsetEdgesAffectedBySafeArea);
 #endif
 
@@ -1463 +1463 @@
     _firstTransactionIDAfterPageRestore = 0;
     _resizeAnimationTransformTransactionID = std::nullopt;
+
+    _avoidsUnsafeArea = YES;
 }
 
@@ -1561 +1563 @@
 
     [self _updateScrollViewBackground];
+    [self _setAvoidsUnsafeArea:layerTreeTransaction.avoidsUnsafeArea()];
 
     if (_gestureController)
@@ -2719 +2722 @@
 }
 
-- (void)_didChangeAvoidsUnsafeArea:(BOOL)avoidsUnsafeArea
-{
+- (void)_setAvoidsUnsafeArea:(BOOL)avoidsUnsafeArea
+{
+    if (_avoidsUnsafeArea == avoidsUnsafeArea)
+        return;
+
+    _avoidsUnsafeArea = avoidsUnsafeArea;
+
     [self _updateScrollViewInsetAdjustmentBehavior];
     [self _scheduleVisibleContentRectUpdate];
@@ -4674 +4682 @@
     if (![self usesStandardContentView])
         return NO;
-    if (!_page)
-        return YES;
-    return _page->avoidsUnsafeArea();
+    return _avoidsUnsafeArea;
 }
 

branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h

@@ -120 +120 @@
 - (void)_hidePasswordView;
 
-- (void)_didChangeAvoidsUnsafeArea:(BOOL)avoidsUnsafeArea;
-
 - (void)_addShortcut:(id)sender;
 - (void)_arrowKey:(id)sender;

branches/safari-604-branch/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h

@@ -147 +147 @@
     WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() override { return WebCore::UserInterfaceLayoutDirection::LTR; }
 
-    void didChangeAvoidsUnsafeArea(bool) override { }
-
     JSGlobalContextRef javascriptGlobalContext() override;
 

branches/safari-604-branch/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h

@@ -118 +118 @@
     WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection() override;
 
-    void didChangeAvoidsUnsafeArea(bool) override { }
-
     JSGlobalContextRef javascriptGlobalContext() override;
 

branches/safari-604-branch/Source/WebKit/UIProcess/PageClient.h

@@ -385 +385 @@
 #endif
 
-    virtual void didChangeAvoidsUnsafeArea(bool avoidsUnsafeArea) = 0;
-
 #if PLATFORM(GTK) || PLATFORM(WPE)
     virtual JSGlobalContextRef javascriptGlobalContext() { return nullptr; }

branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -5499 +5499 @@
     requestPointerUnlock();
 #endif
-
-    m_avoidsUnsafeArea = true;
 }
 
@@ -6935 +6933 @@
 }
 
-void WebPageProxy::setAvoidsUnsafeArea(bool avoidsUnsafeArea)
-{
-    if (m_avoidsUnsafeArea == avoidsUnsafeArea)
-        return;
-
-    m_avoidsUnsafeArea = avoidsUnsafeArea;
-
-    m_pageClient.didChangeAvoidsUnsafeArea(avoidsUnsafeArea);
-}
-
 } // namespace WebKit

branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.h

@@ -1201 +1201 @@
 #endif
 
-    void setAvoidsUnsafeArea(bool);
-    bool avoidsUnsafeArea() const { return m_avoidsUnsafeArea; }
-
 private:
     WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, Ref<API::PageConfiguration>&&);
@@ -2000 +1997 @@
     bool m_isUsingHighPerformanceWebGL { false };
 
-    bool m_avoidsUnsafeArea { true };
-
     WeakPtrFactory<WebPageProxy> m_weakPtrFactory;
 

branches/safari-604-branch/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

@@ -200 +200 @@
     void handleActiveNowPlayingSessionInfoResponse(bool hasActiveSession, const String& title, double duration, double elapsedTime) override;
 
-    void didChangeAvoidsUnsafeArea(bool avoidsUnsafeArea) override;
-
 #if USE(QUICK_LOOK)
     void requestPasswordForQuickLookDocument(const String& fileName, WTF::Function<void(const String&)>&&) override;

branches/safari-604-branch/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -827 +827 @@
 #endif
 
-void PageClientImpl::didChangeAvoidsUnsafeArea(bool avoidsUnsafeArea)
-{
-    [m_webView _didChangeAvoidsUnsafeArea:avoidsUnsafeArea];
-}
-
 } // namespace WebKit
 

branches/safari-604-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

@@ -373 +373 @@
 {
     m_pageExtendedBackgroundColor = layerTreeTransaction.pageExtendedBackgroundColor();
-    setAvoidsUnsafeArea(layerTreeTransaction.avoidsUnsafeArea());
 
     if (!m_hasReceivedLayerTreeTransactionAfterDidCommitLoad) {

branches/safari-604-branch/Source/WebKit/UIProcess/mac/PageClientImpl.h

@@ -254 +254 @@
     void didRestoreScrollPosition() override;
     bool windowIsFrontWindowUnderMouse(const NativeWebMouseEvent&) override;
-
-    void didChangeAvoidsUnsafeArea(bool avoidsUnsafeArea) override { }
 };