Title: [210393] branches/safari-603-branch/Source/WebKit2
- Revision
- 210393
- Author
- matthew_han...@apple.com
- Date
- 2017-01-05 15:49:47 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210363. rdar://problem/19595567
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210392 => 210393)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-05 23:49:44 UTC (rev 210392)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-05 23:49:47 UTC (rev 210393)
@@ -1,5 +1,16 @@
2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210363. rdar://problem/19595567
+
+ 2017-01-05 Enrica Casucci <enr...@apple.com>
+
+ Unreviewed build fix after https://trac.webkit.org/changeset/210360
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::performDragOperation):
+
+2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210360. rdar://problem/19595567
2017-01-05 Enrica Casucci <enr...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (210392 => 210393)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-01-05 23:49:44 UTC (rev 210392)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-01-05 23:49:47 UTC (rev 210393)
@@ -3671,7 +3671,7 @@
createSandboxExtensionsIfNeeded(fileNames, sandboxExtensionHandle, sandboxExtensionForUpload);
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
- else if (![types containsObject:WebArchivePboardType] && [types containsObject:NSFilesPromisePboardType]) {
+ else if (![types containsObject:PasteboardTypes::WebArchivePboardType] && [types containsObject:NSFilesPromisePboardType]) {
NSArray *files = [draggingInfo.draggingPasteboard propertyListForType:NSFilesPromisePboardType];
if (![files isKindOfClass:[NSArray class]]) {
delete dragData;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
