Title: [270467] trunk/Source/WebKit
- Revision
- 270467
- Author
- wenson_hs...@apple.com
- Date
- 2020-12-04 16:55:25 -0800 (Fri, 04 Dec 2020)
Log Message
[iOS] Cancel image extraction when navigating
https://bugs.webkit.org/show_bug.cgi?id=219559
<rdar://problem/71997004>
Reviewed by Tim Horton.
Call `-_cancelImageExtraction` during mainframe navigation. See WebKitAdditions change for more information.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _webTouchEventsRecognized:]):
(-[WKContentView _didStartProvisionalLoadForMainFrame]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (270466 => 270467)
--- trunk/Source/WebKit/ChangeLog 2020-12-05 00:28:31 UTC (rev 270466)
+++ trunk/Source/WebKit/ChangeLog 2020-12-05 00:55:25 UTC (rev 270467)
@@ -1,3 +1,17 @@
+2020-12-04 Wenson Hsieh <wenson_hs...@apple.com>
+
+ [iOS] Cancel image extraction when navigating
+ https://bugs.webkit.org/show_bug.cgi?id=219559
+ <rdar://problem/71997004>
+
+ Reviewed by Tim Horton.
+
+ Call `-_cancelImageExtraction` during mainframe navigation. See WebKitAdditions change for more information.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _webTouchEventsRecognized:]):
+ (-[WKContentView _didStartProvisionalLoadForMainFrame]):
+
2020-12-04 Jer Noble <jer.no...@apple.com>
[Cocoa] Adopt AVOutputDevice.allowsHeadTrackedSpatialAudio
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (270466 => 270467)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-12-05 00:28:31 UTC (rev 270466)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-12-05 00:55:25 UTC (rev 270467)
@@ -1523,7 +1523,7 @@
} forRequest:positionInformationRequest];
#if ENABLE(IMAGE_EXTRACTION)
- [self _cancelImageExtractionIfNeeded:_lastInteractionLocation];
+ [self _cancelImageExtractionIfNeededAfterTouchAt:_lastInteractionLocation];
#endif
}
@@ -4376,6 +4376,9 @@
// in the same location to trigger double-tap recognition.
[self _setDoubleTapGesturesEnabled:NO];
[_twoFingerDoubleTapGestureRecognizer _wk_cancel];
+#if ENABLE(IMAGE_EXTRACTION)
+ [self _cancelImageExtraction];
+#endif
}
- (void)_didCommitLoadForMainFrame
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
