Title: [259499] branches/safari-609.2.1.2-branch/Source/WebKit
- Revision
- 259499
- Author
- [email protected]
- Date
- 2020-04-03 12:58:11 -0700 (Fri, 03 Apr 2020)
Log Message
Cherry-pick r259056. rdar://problem/61231908
Force Touch preview on file:/// URL works while clicking on the URL is blocked
https://bugs.webkit.org/show_bug.cgi?id=209589
<rdar://57687893>
Reviewed by Antoine Quint.
The immediate action for links should never trigger on file: URLs.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _defaultAnimationController]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259056 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609.2.1.2-branch/Source/WebKit/ChangeLog (259498 => 259499)
--- branches/safari-609.2.1.2-branch/Source/WebKit/ChangeLog 2020-04-03 19:58:09 UTC (rev 259498)
+++ branches/safari-609.2.1.2-branch/Source/WebKit/ChangeLog 2020-04-03 19:58:11 UTC (rev 259499)
@@ -1,5 +1,35 @@
2020-04-03 Alan Coon <[email protected]>
+ Cherry-pick r259056. rdar://problem/61231908
+
+ Force Touch preview on file:/// URL works while clicking on the URL is blocked
+ https://bugs.webkit.org/show_bug.cgi?id=209589
+ <rdar://57687893>
+
+ Reviewed by Antoine Quint.
+
+ The immediate action for links should never trigger on file: URLs.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _defaultAnimationController]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259056 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-26 Dean Jackson <[email protected]>
+
+ Force Touch preview on file:/// URL works while clicking on the URL is blocked
+ https://bugs.webkit.org/show_bug.cgi?id=209589
+ <rdar://57687893>
+
+ Reviewed by Antoine Quint.
+
+ The immediate action for links should never trigger on file: URLs.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _defaultAnimationController]):
+
+2020-04-03 Alan Coon <[email protected]>
+
Cherry-pick r258902. rdar://problem/61231866
IPC::Decoder::decodeFixedLengthData() should be marked WARN_UNUSED_RETURN
Modified: branches/safari-609.2.1.2-branch/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm (259498 => 259499)
--- branches/safari-609.2.1.2-branch/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm 2020-04-03 19:58:09 UTC (rev 259498)
+++ branches/safari-609.2.1.2-branch/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm 2020-04-03 19:58:11 UTC (rev 259499)
@@ -276,6 +276,11 @@
String absoluteLinkURL = hitTestResult->absoluteLinkURL();
if (!absoluteLinkURL.isEmpty()) {
+ if (WTF::protocolIs(absoluteLinkURL, "file")) {
+ _type = kWKImmediateActionNone;
+ return nil;
+ }
+
if (WTF::protocolIs(absoluteLinkURL, "mailto")) {
_type = kWKImmediateActionMailtoLink;
return [self _animationControllerForDataDetectedLink];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
