<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211575] branches/safari-604.1.5-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211575">211575</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-02 11:20:06 -0800 (Thu, 02 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211438">r211438</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60415branchSourceWebCoreChangeLog">branches/safari-604.1.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari60415branchSourceWebCoreeditingmacEditorMacmm">branches/safari-604.1.5-branch/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebCorepagemacEventHandlerMacmm">branches/safari-604.1.5-branch/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebCoreplatformmacPasteboardMacmm">branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKitmacChangeLog">branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari60415branchSourceWebKitmacMiscWebNSPasteboardExtrasmm">branches/safari-604.1.5-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKitmacWebViewWebHTMLViewmm">branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKit2ChangeLog">branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari60415branchSourceWebKit2UIProcessCocoaWebViewImplmm">branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKit2WebProcessPluginsPDFPDFPluginmm">branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-02 Matthew Hanson <matt_hanson@apple.com>
+
+ Merge r211438.
+
+ 2017-01-31 Jessie Berlin <jberlin@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):
+
</ins><span class="cx"> 2017-01-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211324.
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebCore/editing/mac/EditorMac.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -90,8 +90,11 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Range> range = selectedRange();
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> // FIXME: How can this hard-coded pasteboard name be right, given that the passed-in pasteboard has a name?
</span><span class="cx"> client()->setInsertionPasteboard(NSGeneralPboard);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> bool chosePlainText;
</span><span class="cx"> RefPtr<DocumentFragment> fragment = webContentFromPasteboard(*pasteboard, *range, allowPlainText, chosePlainText);
</span><span class="lines">@@ -117,8 +120,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> types.append(String(NSStringPboardType));
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> platformStrategies()->pasteboardStrategy()->setTypes(types, NSFindPboard);
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForDataTransfer()), NSStringPboardType, NSFindPboard);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::readSelectionFromPasteboard(const String& pasteboardName, MailBlockquoteHandling mailBlockquoteHandling)
</span><span class="lines">@@ -172,8 +178,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> // FIXME: How can this hard-coded pasteboard name be right, given that the passed-in pasteboard has a name?
</span><span class="cx"> client()->setInsertionPasteboard(NSGeneralPboard);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> bool chosePlainText;
</span><span class="cx"> if (RefPtr<DocumentFragment> fragment = webContentFromPasteboard(pasteboard, *range, true, chosePlainText)) {
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebCore/page/mac/EventHandlerMac.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -724,7 +724,10 @@
</span><span class="cx"> {
</span><span class="cx"> // Must be done before ondragstart adds types and data to the pboard,
</span><span class="cx"> // also done for security, as it erases data from the last drag.
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> auto pasteboard = std::make_unique<Pasteboard>(NSDragPboard);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> pasteboard->clear();
</span><span class="cx"> return DataTransfer::createForDragAndDrop();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -118,7 +118,10 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> return std::make_unique<Pasteboard>(NSGeneralPboard);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</span><span class="lines">@@ -129,7 +132,10 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> return std::make_unique<Pasteboard>(NSDragPboard);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-02 Matthew Hanson <matt_hanson@apple.com>
+
+ Merge r211438.
+
+ 2017-01-31 Jessie Berlin <jberlin@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:]):
+
</ins><span class="cx"> 2017-02-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211492. rdar://problem/30305390
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKitmacMiscWebNSPasteboardExtrasmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -184,7 +184,10 @@
</span><span class="cx">
</span><span class="cx"> + (int)_web_setFindPasteboardString:(NSString *)string withOwner:(id)owner
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSPasteboard *findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:owner];
</span><span class="cx"> [findPasteboard setString:string forType:NSStringPboardType];
</span><span class="cx"> return [findPasteboard changeCount];
</span><span class="lines">@@ -273,7 +276,10 @@
</span><span class="cx"> archive:(WebArchive *)archive
</span><span class="cx"> source:(WebHTMLView *)source
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> ASSERT(self == [NSPasteboard pasteboardWithName:NSDragPboard]);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> NSString *extension = @"";
</span><span class="cx"> RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] initWithObjects:NSFilesPromisePboardType, nil]);
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5343,7 +5343,10 @@
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)_fontAttributesFromFontPasteboard
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSPasteboard *fontPasteboard = [NSPasteboard pasteboardWithName:NSFontPboard];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> if (fontPasteboard == nil)
</span><span class="cx"> return nil;
</span><span class="cx"> NSData *data = [fontPasteboard dataForType:NSFontPboardType];
</span><span class="lines">@@ -5545,7 +5548,10 @@
</span><span class="cx">
</span><span class="cx"> // Put RTF with font attributes on the pasteboard.
</span><span class="cx"> // Maybe later we should add a pasteboard type that contains CSS text for "native" copy and paste font.
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSPasteboard *fontPasteboard = [NSPasteboard pasteboardWithName:NSFontPboard];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [fontPasteboard declareTypes:[NSArray arrayWithObject:NSFontPboardType] owner:nil];
</span><span class="cx"> [fontPasteboard setData:[self _selectionStartFontAttributesAsRTF] forType:NSFontPboardType];
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-02 Matthew Hanson <matt_hanson@apple.com>
+
+ Merge r211438.
+
+ 2017-01-31 Jessie Berlin <jberlin@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):
+
</ins><span class="cx"> 2017-01-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211329.
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3736,7 +3736,10 @@
</span><span class="cx"> {
</span><span class="cx"> // The call below could release the view.
</span><span class="cx"> RetainPtr<NSView> protector(m_view);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> [pasteboard setString:@"" forType:PasteboardTypes::WebDummyPboardType];
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -340,7 +340,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)writeItemsToPasteboard:(NSArray *)items withTypes:(NSArray *)types
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> _pdfPlugin->writeItemsToPasteboard(NSGeneralPboard, items, types);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)showDefinitionForAttributedString:(NSAttributedString *)string atPoint:(CGPoint)point
</span><span class="lines">@@ -1531,8 +1534,11 @@
</span><span class="cx"> [m_pdfLayerController selectAll];
</span><span class="cx"> else if (commandName == "takeFindStringFromSelection") {
</span><span class="cx"> NSString *string = [m_pdfLayerController currentSelection].string;
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (string.length)
</span><span class="cx"> writeItemsToPasteboard(NSFindPboard, @[ [string dataUsingEncoding:NSUTF8StringEncoding] ], @[ NSPasteboardTypeString ]);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -300,7 +300,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)pdfLayerController:(PDFLayerController *)pdfLayerController copyItems:(NSArray *)items withTypes:(NSArray *)types
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> _pdfPlugin->writeItemsToPasteboard(NSGeneralPboard, items, types);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)pdfLayerController:(PDFLayerController *)pdfLayerController showDefinitionForAttributedString:(NSAttributedString *)string atPoint:(CGPoint)point
</span><span class="lines">@@ -1121,8 +1124,11 @@
</span><span class="cx"> [m_pdfLayerController selectAll];
</span><span class="cx"> else if (commandName == "takeFindStringFromSelection") {
</span><span class="cx"> NSString *string = [m_pdfLayerController currentSelection].string;
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (string.length)
</span><span class="cx"> writeItemsToPasteboard(NSFindPboard, @[ [string dataUsingEncoding:NSUTF8StringEncoding] ], @[ NSPasteboardTypeString ]);
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (211574 => 211575)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -108,7 +108,10 @@
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx"> void WebDragClient::declareAndWriteAttachment(const String& pasteboardName, Element& element, const URL& url, const String& path, WebCore::Frame* frame)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> ASSERT(pasteboardName == String(NSDragPboard));
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> NSURL* nsURL = (NSURL *)url;
</span><span class="cx"> m_page->send(Messages::WebPageProxy::SetPromisedDataForAttachment(pasteboardName, String(nsURL.lastPathComponent), String(nsURL.pathExtension), path, String(nsURL.absoluteString), userVisibleString(nsURL)));
</span><span class="lines">@@ -117,7 +120,10 @@
</span><span class="cx">
</span><span class="cx"> void WebDragClient::declareAndWriteDragImage(const String& pasteboardName, Element& element, const URL& url, const String& label, Frame*)
</span><span class="cx"> {
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> ASSERT(pasteboardName == String(NSDragPboard));
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> WebCore::CachedImage* image = cachedImage(element);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>