Diff
Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebCore/ChangeLog 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebCore/ChangeLog 2017-02-02 19:20:06 UTC (rev 211575)
@@ -1,3 +1,21 @@
+2017-02-02 Matthew Hanson <matt_han...@apple.com>
+
+ Merge r211438.
+
+ 2017-01-31 Jessie Berlin <jber...@webkit.org>
+
+ Build fix.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::pasteWithPasteboard):
+ (WebCore::Editor::takeFindStringFromSelection):
+ (WebCore::Editor::replaceNodeFromPasteboard):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+ * platform/mac/PasteboardMac.mm:
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::Pasteboard::createForDragAndDrop):
+
2017-01-27 Babak Shafiei <bshaf...@apple.com>
Merge r211324.
Modified: branches/safari-604.1.5-branch/Source/WebCore/editing/mac/EditorMac.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebCore/editing/mac/EditorMac.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebCore/editing/mac/EditorMac.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -90,8 +90,11 @@
{
RefPtr<Range> range = selectedRange();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// FIXME: How can this hard-coded pasteboard name be right, given that the passed-in pasteboard has a name?
client()->setInsertionPasteboard(NSGeneralPboard);
+#pragma clang diagnostic pop
bool chosePlainText;
RefPtr<DocumentFragment> fragment = webContentFromPasteboard(*pasteboard, *range, allowPlainText, chosePlainText);
@@ -117,8 +120,11 @@
Vector<String> types;
types.append(String(NSStringPboardType));
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
platformStrategies()->pasteboardStrategy()->setTypes(types, NSFindPboard);
platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForDataTransfer()), NSStringPboardType, NSFindPboard);
+#pragma clang diagnostic pop
}
void Editor::readSelectionFromPasteboard(const String& pasteboardName, MailBlockquoteHandling mailBlockquoteHandling)
@@ -172,8 +178,11 @@
return;
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// FIXME: How can this hard-coded pasteboard name be right, given that the passed-in pasteboard has a name?
client()->setInsertionPasteboard(NSGeneralPboard);
+#pragma clang diagnostic pop
bool chosePlainText;
if (RefPtr<DocumentFragment> fragment = webContentFromPasteboard(pasteboard, *range, true, chosePlainText)) {
Modified: branches/safari-604.1.5-branch/Source/WebCore/page/mac/EventHandlerMac.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -724,7 +724,10 @@
{
// Must be done before ondragstart adds types and data to the pboard,
// also done for security, as it erases data from the last drag.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
auto pasteboard = std::make_unique<Pasteboard>(NSDragPboard);
+#pragma clang diagnostic pop
pasteboard->clear();
return DataTransfer::createForDragAndDrop();
}
Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -118,7 +118,10 @@
std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return std::make_unique<Pasteboard>(NSGeneralPboard);
+#pragma clang diagnostic pop
}
std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
@@ -129,7 +132,10 @@
#if ENABLE(DRAG_SUPPORT)
std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return std::make_unique<Pasteboard>(NSDragPboard);
+#pragma clang diagnostic pop
}
std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog 2017-02-02 19:20:06 UTC (rev 211575)
@@ -1,3 +1,18 @@
+2017-02-02 Matthew Hanson <matt_han...@apple.com>
+
+ Merge r211438.
+
+ 2017-01-31 Jessie Berlin <jber...@webkit.org>
+
+ Build fix.
+
+ * Misc/WebNSPasteboardExtras.mm:
+ (+[NSPasteboard _web_setFindPasteboardString:withOwner:]):
+ (-[NSPasteboard _web_declareAndWriteDragImageForElement:URL:title:archive:source:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _fontAttributesFromFontPasteboard]):
+ (-[WebHTMLView copyFont:]):
+
2017-02-01 Matthew Hanson <matthew_han...@apple.com>
Merge r211492. rdar://problem/30305390
Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -184,7 +184,10 @@
+ (int)_web_setFindPasteboardString:(NSString *)string withOwner:(id)owner
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSPasteboard *findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
+#pragma clang diagnostic pop
[findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:owner];
[findPasteboard setString:string forType:NSStringPboardType];
return [findPasteboard changeCount];
@@ -273,7 +276,10 @@
archive:(WebArchive *)archive
source:(WebHTMLView *)source
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
ASSERT(self == [NSPasteboard pasteboardWithName:NSDragPboard]);
+#pragma clang diagnostic pop
NSString *extension = @"";
RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] initWithObjects:NSFilesPromisePboardType, nil]);
Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -5343,7 +5343,10 @@
- (NSDictionary *)_fontAttributesFromFontPasteboard
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSPasteboard *fontPasteboard = [NSPasteboard pasteboardWithName:NSFontPboard];
+#pragma clang diagnostic pop
if (fontPasteboard == nil)
return nil;
NSData *data = "" dataForType:NSFontPboardType];
@@ -5545,7 +5548,10 @@
// Put RTF with font attributes on the pasteboard.
// Maybe later we should add a pasteboard type that contains CSS text for "native" copy and paste font.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSPasteboard *fontPasteboard = [NSPasteboard pasteboardWithName:NSFontPboard];
+#pragma clang diagnostic pop
[fontPasteboard declareTypes:[NSArray arrayWithObject:NSFontPboardType] owner:nil];
[fontPasteboard setData:[self _selectionStartFontAttributesAsRTF] forType:NSFontPboardType];
}
Modified: branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog 2017-02-02 19:20:06 UTC (rev 211575)
@@ -1,3 +1,23 @@
+2017-02-02 Matthew Hanson <matt_han...@apple.com>
+
+ Merge r211438.
+
+ 2017-01-31 Jessie Berlin <jber...@webkit.org>
+
+ Build fix.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::dragImageForView):
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (-[WKPDFLayerControllerDelegate writeItemsToPasteboard:withTypes:]):
+ (WebKit::PDFPlugin::handleEditingCommand):
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (-[WKPDFLayerControllerDelegate pdfLayerController:copyItems:withTypes:]):
+ (WebKit::PDFPlugin::handleEditingCommand):
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::declareAndWriteAttachment):
+ (WebKit::WebDragClient::declareAndWriteDragImage):
+
2017-01-28 Babak Shafiei <bshaf...@apple.com>
Merge r211329.
Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -3736,7 +3736,10 @@
{
// The call below could release the view.
RetainPtr<NSView> protector(m_view);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+#pragma clang diagnostic pop
[pasteboard setString:@"" forType:PasteboardTypes::WebDummyPboardType];
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
Modified: branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -340,7 +340,10 @@
- (void)writeItemsToPasteboard:(NSArray *)items withTypes:(NSArray *)types
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_pdfPlugin->writeItemsToPasteboard(NSGeneralPboard, items, types);
+#pragma clang diagnostic pop
}
- (void)showDefinitionForAttributedString:(NSAttributedString *)string atPoint:(CGPoint)point
@@ -1531,8 +1534,11 @@
[m_pdfLayerController selectAll];
else if (commandName == "takeFindStringFromSelection") {
NSString *string = [m_pdfLayerController currentSelection].string;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (string.length)
writeItemsToPasteboard(NSFindPboard, @[ [string dataUsingEncoding:NSUTF8StringEncoding] ], @[ NSPasteboardTypeString ]);
+#pragma clang diagnostic pop
}
return true;
Modified: branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -300,7 +300,10 @@
- (void)pdfLayerController:(PDFLayerController *)pdfLayerController copyItems:(NSArray *)items withTypes:(NSArray *)types
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
_pdfPlugin->writeItemsToPasteboard(NSGeneralPboard, items, types);
+#pragma clang diagnostic pop
}
- (void)pdfLayerController:(PDFLayerController *)pdfLayerController showDefinitionForAttributedString:(NSAttributedString *)string atPoint:(CGPoint)point
@@ -1121,8 +1124,11 @@
[m_pdfLayerController selectAll];
else if (commandName == "takeFindStringFromSelection") {
NSString *string = [m_pdfLayerController currentSelection].string;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (string.length)
writeItemsToPasteboard(NSFindPboard, @[ [string dataUsingEncoding:NSUTF8StringEncoding] ], @[ NSPasteboardTypeString ]);
+#pragma clang diagnostic pop
}
return true;
Modified: branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (211574 => 211575)
--- branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-02-02 19:12:03 UTC (rev 211574)
+++ branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-02-02 19:20:06 UTC (rev 211575)
@@ -108,7 +108,10 @@
#if ENABLE(ATTACHMENT_ELEMENT)
void WebDragClient::declareAndWriteAttachment(const String& pasteboardName, Element& element, const URL& url, const String& path, WebCore::Frame* frame)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
ASSERT(pasteboardName == String(NSDragPboard));
+#pragma clang diagnostic pop
NSURL* nsURL = (NSURL *)url;
m_page->send(Messages::WebPageProxy::SetPromisedDataForAttachment(pasteboardName, String(nsURL.lastPathComponent), String(nsURL.pathExtension), path, String(nsURL.absoluteString), userVisibleString(nsURL)));
@@ -117,7 +120,10 @@
void WebDragClient::declareAndWriteDragImage(const String& pasteboardName, Element& element, const URL& url, const String& label, Frame*)
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
ASSERT(pasteboardName == String(NSDragPboard));
+#pragma clang diagnostic pop
WebCore::CachedImage* image = cachedImage(element);
