Title: [241555] branches/safari-607-branch/Tools
- Revision
- 241555
- Author
- alanc...@apple.com
- Date
- 2019-02-14 11:00:29 -0800 (Thu, 14 Feb 2019)
Log Message
Cherry-pick r241553. rdar://problem/47610130
Unreviewed, build fix after r241480
* TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
(-[DragAndDropSimulator initWithWebViewFrame:configuration:]):
(-[DragAndDropSimulator initWithWebView:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Tools/ChangeLog (241554 => 241555)
--- branches/safari-607-branch/Tools/ChangeLog 2019-02-14 18:55:22 UTC (rev 241554)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-02-14 19:00:29 UTC (rev 241555)
@@ -1,3 +1,23 @@
+2019-02-14 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r241553. rdar://problem/47610130
+
+ Unreviewed, build fix after r241480
+
+ * TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
+ (-[DragAndDropSimulator initWithWebViewFrame:configuration:]):
+ (-[DragAndDropSimulator initWithWebView:]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-14 Jiewen Tan <jiewen_...@apple.com>
+
+ Unreviewed, build fix after r241480
+
+ * TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
+ (-[DragAndDropSimulator initWithWebViewFrame:configuration:]):
+ (-[DragAndDropSimulator initWithWebView:]):
+
2019-02-13 Babak Shafiei <bshaf...@apple.com>
Cherry-pick r241500. rdar://problem/48065631
Modified: branches/safari-607-branch/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm (241554 => 241555)
--- branches/safari-607-branch/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm 2019-02-14 18:55:22 UTC (rev 241554)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm 2019-02-14 19:00:29 UTC (rev 241555)
@@ -332,7 +332,6 @@
- (instancetype)initWithWebViewFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
{
- self.dragDestinationAction = WKDragDestinationActionAny & ~WKDragDestinationActionLoad;
if (configuration)
return [self initWithWebView:[[[TestWKWebView alloc] initWithFrame:frame configuration:configuration] autorelease]];
@@ -347,6 +346,7 @@
_shouldAllowMoveOperation = YES;
[_webView setUIDelegate:self];
[_webView _setInputDelegate:self];
+ self.dragDestinationAction = WKDragDestinationActionAny & ~WKDragDestinationActionLoad;
}
return self;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
