Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212496 => 212497)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 00:56:24 UTC (rev 212496)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 00:56:27 UTC (rev 212497)
@@ -1,5 +1,24 @@
2017-02-16 Matthew Hanson <[email protected]>
+ Merge r212167. rdar://problem/30428673
+
+ 2017-02-10 Tim Horton <[email protected]>
+
+ Infinite UI process hang under ensurePositionInformationIsUpToDate
+ https://bugs.webkit.org/show_bug.cgi?id=168154
+ <rdar://problem/30428673>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanupInteraction]):
+ If the web process crashes or we're being torn down for another reason,
+ assume that we aren't ever going to receive any pending async interaction
+ information update. Otherwise, ensurePositionInformationIsUpToDate can end
+ up waiting for it forever.
+
+2017-02-16 Matthew Hanson <[email protected]>
+
Merge r212000. rdar://problem/30313696
2017-02-09 Brady Eidson <[email protected]>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (212496 => 212497)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-17 00:56:24 UTC (rev 212496)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-17 00:56:27 UTC (rev 212497)
@@ -604,6 +604,7 @@
[_formInputSession invalidate];
_formInputSession = nil;
[_highlightView removeFromSuperview];
+ _outstandingPositionInformationRequest = std::nullopt;
if (_interactionViewsContainerView) {
[self.layer removeObserver:self forKeyPath:@"transform"];
Modified: branches/safari-603-branch/Tools/ChangeLog (212496 => 212497)
--- branches/safari-603-branch/Tools/ChangeLog 2017-02-17 00:56:24 UTC (rev 212496)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-17 00:56:27 UTC (rev 212497)
@@ -1,5 +1,27 @@
2017-02-16 Matthew Hanson <[email protected]>
+ Merge r212167. rdar://problem/30428673
+
+ 2017-02-10 Tim Horton <[email protected]>
+
+ Infinite UI process hang under ensurePositionInformationIsUpToDate
+ https://bugs.webkit.org/show_bug.cgi?id=168154
+ <rdar://problem/30428673>
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/InteractionDeadlockAfterCrash.mm: Added.
+ (recursiveFindHighlightLongPressRecognizer):
+ (TEST):
+ Add a somewhat nasty test that does an async interaction information update, but
+ kills the Web process before it arrives, and then does a sync interaction
+ information update, which will wait for the oustanding async interaction
+ information update if we still think it's coming. Before the patch, this
+ test times out with the UI process stuck under ensurePositionInformationIsUpToDate.
+
+2017-02-16 Matthew Hanson <[email protected]>
+
Merge r212153. rdar://problem/30467120
2017-02-10 Simon Fraser <[email protected]>
Modified: branches/safari-603-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (212496 => 212497)
--- branches/safari-603-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-02-17 00:56:24 UTC (rev 212496)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-02-17 00:56:27 UTC (rev 212497)
@@ -59,6 +59,7 @@
2D1C04A71D76298B000A6816 /* TestNavigationDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D1C04A61D76298B000A6816 /* TestNavigationDelegate.mm */; };
2D4CF8BD1D8360CC0001CE8D /* WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D4CF8BC1D8360CC0001CE8D /* WKThumbnailView.mm */; };
2D51A0C71C8BF00C00765C45 /* DOMHTMLVideoElementWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */; };
+ 2DB0232F1E4E871800707123 /* InteractionDeadlockAfterCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DB0232E1E4E871800707123 /* InteractionDeadlockAfterCrash.mm */; };
2DC4CF771D2D9DD800ECCC94 /* DataDetection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC4CF761D2D9DD800ECCC94 /* DataDetection.mm */; };
2DD7D3AF178227B30026E1E3 /* lots-of-text-vertical-lr.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2DD7D3AE178227AC0026E1E3 /* lots-of-text-vertical-lr.html */; };
2DE71AFE1D49C0BD00904094 /* AnimatedResize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DE71AFD1D49C0BD00904094 /* AnimatedResize.mm */; };
@@ -858,6 +859,7 @@
2D640B5417875DFF00BFAF99 /* ScrollPinningBehaviors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollPinningBehaviors.cpp; sourceTree = "<group>"; };
2D8104CB1BEC13E70020DA46 /* FindInPage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FindInPage.mm; sourceTree = "<group>"; };
2D9A53AE1B31FA8D0074D5AA /* ShrinkToFit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ShrinkToFit.mm; sourceTree = "<group>"; };
+ 2DB0232E1E4E871800707123 /* InteractionDeadlockAfterCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InteractionDeadlockAfterCrash.mm; sourceTree = "<group>"; };
2DC4CF761D2D9DD800ECCC94 /* DataDetection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataDetection.mm; sourceTree = "<group>"; };
2DD355351BD08378005DF4A7 /* AutoLayoutIntegration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoLayoutIntegration.mm; sourceTree = "<group>"; };
2DD7D3A9178205D00026E1E3 /* ResizeReversePaginatedWebView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResizeReversePaginatedWebView.cpp; sourceTree = "<group>"; };
@@ -1506,6 +1508,7 @@
51A587841D272EF3004BA9AF /* IndexedDBDatabaseProcessKill.mm */,
51BCEE491C84F4AF0042C82E /* IndexedDBMultiProcess.mm */,
51B1EE8D1C80F5880064FB98 /* IndexedDBPersistence.mm */,
+ 2DB0232E1E4E871800707123 /* InteractionDeadlockAfterCrash.mm */,
37D36ED61AF42ECD00BAF5D9 /* LoadAlternateHTMLString.mm */,
57901FAC1CAF12C200ED64F9 /* LoadInvalidURLRequest.mm */,
51E6A8921D2F1BEC00C004B6 /* LocalStorageClear.mm */,
@@ -2611,6 +2614,7 @@
CEBCA12F1E3A660100C73293 /* OverrideContentSecurityPolicy.mm in Sources */,
7CCB4DA91C83AE7300CC6918 /* PageGroup.cpp in Sources */,
5769C50B1D9B0002000847FB /* SerializedCryptoKeyWrap.mm in Sources */,
+ 2DB0232F1E4E871800707123 /* InteractionDeadlockAfterCrash.mm in Sources */,
7CCE7F071A411AE600447C4C /* PageLoadBasic.cpp in Sources */,
7CCE7F081A411AE600447C4C /* PageLoadDidChangeLocationWithinPageForFrame.cpp in Sources */,
7CCE7EC71A411A7E00447C4C /* PageVisibilityStateWithWindowChanges.mm in Sources */,
Added: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/InteractionDeadlockAfterCrash.mm (0 => 212497)
--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/InteractionDeadlockAfterCrash.mm (rev 0)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/InteractionDeadlockAfterCrash.mm 2017-02-17 00:56:27 UTC (rev 212497)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#import "PlatformUtilities.h"
+#import "Test.h"
+#import "TestNavigationDelegate.h"
+#import <WebKit/WKWebViewConfigurationPrivate.h>
+#import <WebKit/WKWebViewPrivate.h>
+#import <wtf/RetainPtr.h>
+
+@interface NSObject ()
+
+- (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
+
+@end
+
+#if PLATFORM(IOS) && WK_API_ENABLED
+
+static UIGestureRecognizer *recursiveFindHighlightLongPressRecognizer(UIView *view)
+{
+ for (UIGestureRecognizer *recognizer in view.gestureRecognizers) {
+ if ([recognizer isKindOfClass:NSClassFromString(@"_UIWebHighlightLongPressGestureRecognizer")])
+ return recognizer;
+ }
+
+ for (UIView *subview in view.subviews) {
+ UIGestureRecognizer *recognizer = recursiveFindHighlightLongPressRecognizer(subview);
+ if (recognizer)
+ return recognizer;
+ }
+
+ return nil;
+}
+
+TEST(WebKit2, InteractionDeadlockAfterCrash)
+{
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
+
+ [webView loadHTMLString:@"test" baseURL:nil];
+ [webView _test_waitForDidFinishNavigation];
+
+ UIGestureRecognizer *highlightLongPressRecognizer = recursiveFindHighlightLongPressRecognizer(webView.get());
+ UIView *interactionView = highlightLongPressRecognizer.view;
+ EXPECT_NOT_NULL(highlightLongPressRecognizer);
+
+ // This will start an asynchronous interaction information update.
+ BOOL shouldBegin = [[highlightLongPressRecognizer delegate] gestureRecognizerShouldBegin:highlightLongPressRecognizer];
+ EXPECT_TRUE(shouldBegin);
+
+ [webView _killWebContentProcessAndResetState];
+
+ [webView loadHTMLString:@"test" baseURL:nil];
+ [webView _test_waitForDidFinishNavigation];
+
+ // This will synchronously ensure we have up-to-date interaction information.
+ [interactionView hasSelectablePositionAtPoint:CGPointZero];
+}
+
+#endif
