<!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>[212681] trunk</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/212681">212681</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-20 16:08:34 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the new drag code path when dragging links
https://bugs.webkit.org/show_bug.cgi?id=168612
Reviewed by Tim Horton.
Source/WebCore:
* editing/Editor.cpp:
(WebCore::Editor::copyURL):
Use userVisibleString instead of fillInUserVisibleForm.
(WebCore::Editor::pasteboardWriterURL):
New function that returns a PasteboardWriterData::URL for a given URL + title.
* editing/Editor.h:
Add new members.
* editing/mac/EditorMac.mm:
(WebCore::Editor::userVisibleString):
(WebCore::Editor::fillInUserVisibleForm): Deleted.
Add a getter instead of a function that fills in a struct member.
* page/DragController.cpp:
(WebCore::DragController::startDrag):
Add the new DragItem code path when dragging links.
* platform/PasteboardWriterData.cpp:
(WebCore::PasteboardWriterData::isEmpty):
Check for m_url as well.
(WebCore::PasteboardWriterData::setURL):
Set m_url.
* platform/PasteboardWriterData.h:
Add new members.
* platform/mac/PasteboardWriter.mm:
(WebCore::toUTI):
New helper function that returns an UTI from a pasteboard type.
(WebCore::createPasteboardWriter):
Handle converting URLs to the various pasteboard types.
Tools:
If a type is not dynamic, just use the static UTI.
* DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
(-[LocalPasteboard writeObjects:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardWriterDatacpp">trunk/Source/WebCore/platform/PasteboardWriterData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardWriterDatah">trunk/Source/WebCore/platform/PasteboardWriterData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPasteboardWritermm">trunk/Source/WebCore/platform/mac/PasteboardWriter.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreePasteboardmm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/ChangeLog 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2017-02-20 Anders Carlsson <andersca@apple.com>
+
+ Use the new drag code path when dragging links
+ https://bugs.webkit.org/show_bug.cgi?id=168612
+
+ Reviewed by Tim Horton.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::copyURL):
+ Use userVisibleString instead of fillInUserVisibleForm.
+
+ (WebCore::Editor::pasteboardWriterURL):
+ New function that returns a PasteboardWriterData::URL for a given URL + title.
+
+ * editing/Editor.h:
+ Add new members.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::userVisibleString):
+ (WebCore::Editor::fillInUserVisibleForm): Deleted.
+ Add a getter instead of a function that fills in a struct member.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+ Add the new DragItem code path when dragging links.
+
+ * platform/PasteboardWriterData.cpp:
+ (WebCore::PasteboardWriterData::isEmpty):
+ Check for m_url as well.
+
+ (WebCore::PasteboardWriterData::setURL):
+ Set m_url.
+
+ * platform/PasteboardWriterData.h:
+ Add new members.
+
+ * platform/mac/PasteboardWriter.mm:
+ (WebCore::toUTI):
+ New helper function that returns an UTI from a pasteboard type.
+
+ (WebCore::createPasteboardWriter):
+ Handle converting URLs to the various pasteboard types.
+
</ins><span class="cx"> 2017-02-20 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Add plumbing to the UI process for TextIndicatorData when computing the drag image
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/editing/Editor.cpp 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -1346,12 +1346,25 @@
</span><span class="cx"> pasteboardURL.title = title;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- fillInUserVisibleForm(pasteboardURL);
</del><ins>+ pasteboardURL.userVisibleForm = userVisibleString(url);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> pasteboard.write(pasteboardURL);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PasteboardWriterData::URL Editor::pasteboardWriterURL(const URL& url, const String& title)
+{
+ PasteboardWriterData::URL result;
+
+ result.url = url;
+ result.title = title;
+#if PLATFORM(MAC)
+ result.userVisibleForm = userVisibleString(url);
+#endif
+
+ return result;
+}
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void Editor::copyImage(const HitTestResult& result)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/editing/Editor.h 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "EditorInsertAction.h"
</span><span class="cx"> #include "FindOptions.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><ins>+#include "PasteboardWriterData.h"
</ins><span class="cx"> #include "TextChecking.h"
</span><span class="cx"> #include "TextEventInputType.h"
</span><span class="cx"> #include "TextIteratorBehavior.h"
</span><span class="lines">@@ -147,6 +148,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void copyURL(const URL&, const String& title);
</span><span class="cx"> void copyURL(const URL&, const String& title, Pasteboard&);
</span><ins>+ PasteboardWriterData::URL pasteboardWriterURL(const URL&, const String& title);
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> WEBCORE_EXPORT void copyImage(const HitTestResult&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -526,7 +528,7 @@
</span><span class="cx"> RefPtr<DocumentFragment> createFragmentForImageResourceAndAddResource(RefPtr<ArchiveResource>&&);
</span><span class="cx"> RefPtr<DocumentFragment> createFragmentAndAddResources(NSAttributedString *);
</span><span class="cx"> FragmentAndResources createFragment(NSAttributedString *);
</span><del>- void fillInUserVisibleForm(PasteboardURL&);
</del><ins>+ String userVisibleString(const URL&);
</ins><span class="cx">
</span><span class="cx"> static RefPtr<SharedBuffer> dataInRTFDFormat(NSAttributedString *);
</span><span class="cx"> static RefPtr<SharedBuffer> dataInRTFFormat(NSAttributedString *);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -251,9 +251,9 @@
</span><span class="cx"> cachedImage = tentativeCachedImage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::fillInUserVisibleForm(PasteboardURL& pasteboardURL)
</del><ins>+String Editor::userVisibleString(const URL& url)
</ins><span class="cx"> {
</span><del>- pasteboardURL.userVisibleForm = client()->userVisibleString(pasteboardURL.url);
</del><ins>+ return client()->userVisibleString(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::selectionWillChange()
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -933,10 +933,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) {
</span><ins>+ PasteboardWriterData pasteboardWriterData;
+
</ins><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="cx"> // Simplify whitespace so the title put on the dataTransfer resembles what the user sees
</span><span class="cx"> // on the web page. This includes replacing newlines with spaces.
</span><del>- src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), dataTransfer.pasteboard());
</del><ins>+ if (mustUseLegacyDragClient)
+ src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), dataTransfer.pasteboard());
+ else
+ pasteboardWriterData.setURL(src.editor().pasteboardWriterURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace()));
</ins><span class="cx"> } else {
</span><span class="cx"> // Make sure the pasteboard also contains trustworthy link data
</span><span class="cx"> // but don't overwrite more general pasteboard types.
</span><span class="lines">@@ -967,9 +972,21 @@
</span><span class="cx"> dragImage = DragImage { platformAdjustDragImageForDeviceScaleFactor(dragImage.get(), m_page.deviceScaleFactor()) };
</span><span class="cx"> if (textIndicator.contentImage)
</span><span class="cx"> dragImage.setIndicatorData(textIndicator);
</span><ins>+ dragImageAnchorPoint = FloatPoint { 0.5, static_cast<float>((size.height() - LinkDragBorderInset) / size.height()) };
</ins><span class="cx"> }
</span><del>- doSystemDrag(WTFMove(dragImage), dragLoc, mouseDraggedPoint, { }, dataTransfer, src, DragSourceActionLink);
</del><span class="cx">
</span><ins>+ if (mustUseLegacyDragClient) {
+ doSystemDrag(WTFMove(dragImage), dragLoc, mouseDraggedPoint, { }, dataTransfer, src, DragSourceActionLink);
+ return true;
+ }
+
+ DragItem dragItem;
+ dragItem.image = WTFMove(dragImage);
+ dragItem.imageAnchorPoint = dragImageAnchorPoint;
+ dragItem.data = WTFMove(pasteboardWriterData);
+
+ beginDrag(WTFMove(dragItem), src, dragOrigin, mouseDraggedPoint, dataTransfer, DragSourceActionSelection);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardWriterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardWriterData.cpp (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardWriterData.cpp 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/platform/PasteboardWriterData.cpp 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -41,6 +41,9 @@
</span><span class="cx"> if (m_plainText)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (m_url)
+ return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -51,4 +54,11 @@
</span><span class="cx"> m_plainText = WTFMove(plainText);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PasteboardWriterData::setURL(URL url)
+{
+ ASSERT(!m_url);
+
+ m_url = WTFMove(url);
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardWriterDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardWriterData.h (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardWriterData.h 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/platform/PasteboardWriterData.h 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -35,18 +36,32 @@
</span><span class="cx"> PasteboardWriterData();
</span><span class="cx"> ~PasteboardWriterData();
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT bool isEmpty() const;
+
</ins><span class="cx"> struct PlainText {
</span><span class="cx"> bool canSmartCopyOrDelete;
</span><span class="cx"> String text;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WEBCORE_EXPORT bool isEmpty() const;
-
</del><span class="cx"> const std::optional<PlainText>& plainText() const { return m_plainText; }
</span><span class="cx"> void setPlainText(PlainText);
</span><span class="cx">
</span><ins>+ struct URL {
+ WebCore::URL url;
+ String title;
+#if PLATFORM(MAC)
+ String userVisibleForm;
+#elif PLATFORM(GTK)
+ String markup;
+#endif
+ };
+
+ const std::optional<URL>& url() const { return m_url; }
+ void setURL(URL);
+
</ins><span class="cx"> private:
</span><span class="cx"> std::optional<PlainText> m_plainText;
</span><ins>+ std::optional<URL> m_url;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardWritermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardWriter.mm (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardWriter.mm 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Source/WebCore/platform/mac/PasteboardWriter.mm 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -33,6 +33,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static RetainPtr<NSString> toUTI(NSString *pasteboardType)
+{
+ return adoptNS((__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)pasteboardType, nullptr));
+}
+
</ins><span class="cx"> RetainPtr<id <NSPasteboardWriting>> createPasteboardWriter(const PasteboardWriterData& data)
</span><span class="cx"> {
</span><span class="cx"> auto pasteboardItem = adoptNS([[NSPasteboardItem alloc] init]);
</span><span class="lines">@@ -45,6 +50,39 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (auto& url = data.url()) {
+ NSURL *cocoaURL = url->url;
+ NSString *userVisibleString = url->userVisibleForm;
+ NSString *title = (NSString *)url->title;
+ if (!title.length) {
+ title = cocoaURL.path.lastPathComponent;
+ if (!title.length)
+ title = userVisibleString;
+ }
+
+ // WebURLsWithTitlesPboardType.
+ auto paths = adoptNS([[NSArray alloc] initWithObjects:@[ @[ cocoaURL.absoluteString ] ], @[ url->title.stripWhiteSpace() ], nil]);
+ [pasteboardItem setPropertyList:paths.get() forType:toUTI(@"WebURLsWithTitlesPboardType").get()];
+
+ // NSURLPboardType.
+ if (NSURL *baseCocoaURL = cocoaURL.baseURL)
+ [pasteboardItem setPropertyList:@[ cocoaURL.relativeString, baseCocoaURL.absoluteString ] forType:toUTI(NSURLPboardType).get()];
+ else if (cocoaURL)
+ [pasteboardItem setPropertyList:@[ cocoaURL.absoluteString, @"" ] forType:toUTI(NSURLPboardType).get()];
+ else
+ [pasteboardItem setPropertyList:@[ @"", @"" ] forType:toUTI(NSURLPboardType).get()];
+
+ if (cocoaURL.fileURL)
+ [pasteboardItem setString:cocoaURL.absoluteString forType:(NSString *)kUTTypeFileURL];
+ [pasteboardItem setString:userVisibleString forType:(NSString *)kUTTypeURL];
+
+ // WebURLNamePboardType.
+ [pasteboardItem setString:title forType:@"public.url-name"];
+
+ // NSPasteboardTypeString.
+ [pasteboardItem setString:userVisibleString forType:NSPasteboardTypeString];
+ }
+
</ins><span class="cx"> return pasteboardItem;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Tools/ChangeLog 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-20 Anders Carlsson <andersca@apple.com>
+
+ Use the new drag code path when dragging links
+ https://bugs.webkit.org/show_bug.cgi?id=168612
+
+ Reviewed by Tim Horton.
+
+ If a type is not dynamic, just use the static UTI.
+
+ * DumpRenderTree/mac/DumpRenderTreePasteboard.mm:
+ (-[LocalPasteboard writeObjects:]):
+
</ins><span class="cx"> 2017-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a new drag code path and use it for dragging plain text
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreePasteboardmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm (212680 => 212681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm 2017-02-21 00:04:38 UTC (rev 212680)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm 2017-02-21 00:08:34 UTC (rev 212681)
</span><span class="lines">@@ -219,8 +219,13 @@
</span><span class="cx"> {
</span><span class="cx"> for (id <NSPasteboardWriting> object in objects) {
</span><span class="cx"> for (NSString *type in [object writableTypesForPasteboard:self]) {
</span><del>- auto pasteboardType = adoptNS((__bridge NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)type, kUTTagClassNSPboardType));
</del><ins>+ auto pasteboardType = ^{
+ if (UTTypeIsDynamic((__bridge CFStringRef)type))
+ return adoptNS((__bridge NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)type, kUTTagClassNSPboardType));
</ins><span class="cx">
</span><ins>+ return retainPtr(type);
+ }();
+
</ins><span class="cx"> [self addTypes:@[ pasteboardType.get() ] owner:self];
</span><span class="cx">
</span><span class="cx"> id propertyList = [object pasteboardPropertyListForType:type];
</span></span></pre>
</div>
</div>
</body>
</html>