Title: [248299] branches/safari-608.1-branch/Source/WebKit
Revision
248299
Author
kocsen_ch...@apple.com
Date
2019-08-06 09:26:47 -0700 (Tue, 06 Aug 2019)

Log Message

Cherry-pick r247838. rdar://problem/53973599

    WebKit/UIProcess/ios/WKContentViewInteraction.mm: error: implementing deprecated method contextMenuInteractionWillPresent
    https://bugs.webkit.org/show_bug.cgi?id=200136
    <rdar://problem/53547698>

    Reviewed by Wenson Hsieh.

    Ignore deprecation warnings for these UIContextMenuInteraction delegates.

    * UIProcess/ios/WKContentViewInteraction.mm:
    (-[WKContentView contextMenuInteractionWillPresent:]):
    (-[WKContentView contextMenuInteraction:willCommitWithAnimator:]):
    (-[WKContentView contextMenuInteractionDidEnd:]):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-608.1-branch/Source/WebKit/ChangeLog (248298 => 248299)


--- branches/safari-608.1-branch/Source/WebKit/ChangeLog	2019-08-06 16:26:40 UTC (rev 248298)
+++ branches/safari-608.1-branch/Source/WebKit/ChangeLog	2019-08-06 16:26:47 UTC (rev 248299)
@@ -1,5 +1,39 @@
 2019-08-06  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r247838. rdar://problem/53973599
+
+    WebKit/UIProcess/ios/WKContentViewInteraction.mm: error: implementing deprecated method contextMenuInteractionWillPresent
+    https://bugs.webkit.org/show_bug.cgi?id=200136
+    <rdar://problem/53547698>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Ignore deprecation warnings for these UIContextMenuInteraction delegates.
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView contextMenuInteractionWillPresent:]):
+    (-[WKContentView contextMenuInteraction:willCommitWithAnimator:]):
+    (-[WKContentView contextMenuInteractionDidEnd:]):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247838 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-25  Dean Jackson  <d...@apple.com>
+
+            WebKit/UIProcess/ios/WKContentViewInteraction.mm: error: implementing deprecated method contextMenuInteractionWillPresent
+            https://bugs.webkit.org/show_bug.cgi?id=200136
+            <rdar://problem/53547698>
+
+            Reviewed by Wenson Hsieh.
+
+            Ignore deprecation warnings for these UIContextMenuInteraction delegates.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView contextMenuInteractionWillPresent:]):
+            (-[WKContentView contextMenuInteraction:willCommitWithAnimator:]):
+            (-[WKContentView contextMenuInteractionDidEnd:]):
+
+2019-08-06  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r247837. rdar://problem/53973599
 
     Add helper for ignoring deprecated implementation warnings

Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (248298 => 248299)


--- branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-08-06 16:26:40 UTC (rev 248298)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-08-06 16:26:47 UTC (rev 248299)
@@ -8072,7 +8072,9 @@
     return [self _createTargetedPreviewIfPossible];
 }
 
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
 - (void)contextMenuInteractionWillPresent:(UIContextMenuInteraction *)interaction
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
 {
     if (!_webView)
         return;
@@ -8093,7 +8095,9 @@
     return std::exchange(_contextMenuInteractionTargetedPreview, nil).autorelease();
 }
 
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
 - (void)contextMenuInteraction:(UIContextMenuInteraction *)interaction willCommitWithAnimator:(id<UIContextMenuInteractionCommitAnimating>)animator
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
 {
     if (!_webView)
         return;
@@ -8146,7 +8150,9 @@
     }
 }
 
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
 - (void)contextMenuInteractionDidEnd:(UIContextMenuInteraction *)interaction
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
 {
     if (!_webView)
         return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to