<!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>[213597] trunk/Source/WebCore</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/213597">213597</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-08 14:14:26 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the new code path when dragging web contents
https://bugs.webkit.org/show_bug.cgi?id=169298
Reviewed by Beth Dakin.
* editing/Editor.h:
* editing/cocoa/EditorCocoa.mm:
(WebCore::Editor::writeSelection):
Add a new function that writes the selection to a writer object.
* page/DragController.cpp:
(WebCore::DragController::startDrag):
Use the new writeSelection if mustUseLegacyDragClient is false.
* platform/PasteboardWriterData.cpp:
(WebCore::PasteboardWriterData::WebContent::WebContent):
(WebCore::PasteboardWriterData::WebContent::~WebContent):
(WebCore::PasteboardWriterData::setWebContent):
* platform/PasteboardWriterData.h:
Add getters and setters.
* platform/mac/PasteboardWriter.mm:
(WebCore::toUTIUnlessAlreadyUTI):
Add a helper.
(WebCore::createPasteboardWriter):
Convert web content to pasteboard types.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaEditorCocoamm">trunk/Source/WebCore/editing/cocoa/EditorCocoa.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/ChangeLog 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2017-03-07 Anders Carlsson <andersca@apple.com>
+
+ Use the new code path when dragging web contents
+ https://bugs.webkit.org/show_bug.cgi?id=169298
+
+ Reviewed by Beth Dakin.
+
+ * editing/Editor.h:
+ * editing/cocoa/EditorCocoa.mm:
+ (WebCore::Editor::writeSelection):
+ Add a new function that writes the selection to a writer object.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+ Use the new writeSelection if mustUseLegacyDragClient is false.
+
+ * platform/PasteboardWriterData.cpp:
+ (WebCore::PasteboardWriterData::WebContent::WebContent):
+ (WebCore::PasteboardWriterData::WebContent::~WebContent):
+ (WebCore::PasteboardWriterData::setWebContent):
+ * platform/PasteboardWriterData.h:
+ Add getters and setters.
+
+ * platform/mac/PasteboardWriter.mm:
+ (WebCore::toUTIUnlessAlreadyUTI):
+ Add a helper.
+
+ (WebCore::createPasteboardWriter):
+ Convert web content to pasteboard types.
+
</ins><span class="cx"> 2017-03-08 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> CSS Multicolumn should not clip columns horizontally
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/editing/Editor.h 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> class KeyboardEvent;
</span><span class="cx"> class KillRing;
</span><span class="cx"> class Pasteboard;
</span><ins>+class PasteboardWriterData;
</ins><span class="cx"> class SharedBuffer;
</span><span class="cx"> class Font;
</span><span class="cx"> class SpellCheckRequest;
</span><span class="lines">@@ -469,6 +470,7 @@
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(GTK)
</span><span class="cx"> WEBCORE_EXPORT void writeSelectionToPasteboard(Pasteboard&);
</span><span class="cx"> WEBCORE_EXPORT void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);
</span><ins>+ void writeSelection(PasteboardWriterData&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaEditorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -171,6 +171,25 @@
</span><span class="cx"> pasteboard.write(content);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Editor::writeSelection(PasteboardWriterData& pasteboardWriterData)
+{
+ NSAttributedString *attributedString = attributedStringFromRange(*selectedRange());
+
+ PasteboardWriterData::WebContent webContent;
+ webContent.canSmartCopyOrDelete = canSmartCopyOrDelete();
+ webContent.dataInWebArchiveFormat = selectionInWebArchiveFormat();
+ webContent.dataInRTFDFormat = attributedString.containsAttachments ? dataInRTFDFormat(attributedString) : nullptr;
+ webContent.dataInRTFFormat = dataInRTFFormat(attributedString);
+ // FIXME: Why don't we want this on iOS?
+#if PLATFORM(MAC)
+ webContent.dataInHTMLFormat = selectionInHTMLFormat();
+#endif
+ webContent.dataInStringFormat = stringSelectionForPasteboardWithImageAltText();
+ client()->getClientPasteboardDataForRange(selectedRange().get(), webContent.clientTypes, webContent.clientData);
+
+ pasteboardWriterData.setWebContent(WTFMove(webContent));
+}
+
</ins><span class="cx"> RefPtr<SharedBuffer> Editor::selectionInWebArchiveFormat()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<LegacyWebArchive> archive = LegacyWebArchive::createFromSelection(&m_frame);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -875,14 +875,18 @@
</span><span class="cx"> pasteboardWriterData.setPlainText(WTFMove(plainText));
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- mustUseLegacyDragClient = true;
-
</del><ins>+ if (mustUseLegacyDragClient) {
</ins><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(GTK)
</span><del>- src.editor().writeSelectionToPasteboard(dataTransfer.pasteboard());
</del><ins>+ src.editor().writeSelectionToPasteboard(dataTransfer.pasteboard());
</ins><span class="cx"> #else
</span><del>- // FIXME: Convert all other platforms to match Mac and delete this.
- dataTransfer.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForDataTransfer);
</del><ins>+ // FIXME: Convert all other platforms to match Mac and delete this.
+ dataTransfer.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForDataTransfer);
</ins><span class="cx"> #endif
</span><ins>+ } else {
+#if PLATFORM(COCOA)
+ src.editor().writeSelection(pasteboardWriterData);
+#endif
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> src.editor().didWriteSelectionToPasteboard();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardWriterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardWriterData.cpp (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardWriterData.cpp 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/platform/PasteboardWriterData.cpp 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PasteboardWriterData.h"
</span><span class="cx">
</span><ins>+#include "SharedBuffer.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PasteboardWriterData::PasteboardWriterData()
</span><span class="lines">@@ -36,6 +38,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PasteboardWriterData::WebContent::WebContent()
+{
+}
+
+PasteboardWriterData::WebContent::~WebContent()
+{
+}
+
</ins><span class="cx"> bool PasteboardWriterData::isEmpty() const
</span><span class="cx"> {
</span><span class="cx"> if (m_plainText)
</span><span class="lines">@@ -61,4 +71,11 @@
</span><span class="cx"> m_url = WTFMove(url);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PasteboardWriterData::setWebContent(WebContent webContent)
+{
+ ASSERT(!m_webContent);
+
+ m_webContent = webContent;
</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 (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardWriterData.h 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/platform/PasteboardWriterData.h 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class SharedBuffer;
+
</ins><span class="cx"> class PasteboardWriterData final {
</span><span class="cx"> public:
</span><span class="cx"> PasteboardWriterData();
</span><span class="lines">@@ -43,6 +45,25 @@
</span><span class="cx"> String text;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ struct WebContent {
+ WebContent();
+ ~WebContent();
+
+#if PLATFORM(COCOA)
+ bool canSmartCopyOrDelete;
+ RefPtr<SharedBuffer> dataInWebArchiveFormat;
+ RefPtr<SharedBuffer> dataInRTFDFormat;
+ RefPtr<SharedBuffer> dataInRTFFormat;
+ // FIXME: Why don't we want this on iOS?
+#if PLATFORM(MAC)
+ String dataInHTMLFormat;
+#endif
+ String dataInStringFormat;
+ Vector<String> clientTypes;
+ Vector<RefPtr<SharedBuffer>> clientData;
+#endif
+ };
+
</ins><span class="cx"> const std::optional<PlainText>& plainText() const { return m_plainText; }
</span><span class="cx"> void setPlainText(PlainText);
</span><span class="cx">
</span><span class="lines">@@ -59,9 +80,13 @@
</span><span class="cx"> const std::optional<URL>& url() const { return m_url; }
</span><span class="cx"> void setURL(URL);
</span><span class="cx">
</span><ins>+ const std::optional<WebContent>& webContent() const { return m_webContent; }
+ void setWebContent(WebContent);
+
</ins><span class="cx"> private:
</span><span class="cx"> std::optional<PlainText> m_plainText;
</span><span class="cx"> std::optional<URL> m_url;
</span><ins>+ std::optional<WebContent> m_webContent;
</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 (213596 => 213597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardWriter.mm 2017-03-08 22:10:45 UTC (rev 213596)
+++ trunk/Source/WebCore/platform/mac/PasteboardWriter.mm 2017-03-08 22:14:26 UTC (rev 213597)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "NSPasteboardSPI.h"
</span><span class="cx"> #import "PasteboardWriterData.h"
</span><ins>+#import "SharedBuffer.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -38,6 +39,16 @@
</span><span class="cx"> return adoptNS((__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)pasteboardType, nullptr));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RetainPtr<NSString> toUTIUnlessAlreadyUTI(NSString *type)
+{
+ if (UTTypeIsDeclared((__bridge CFStringRef)type) || UTTypeIsDynamic((__bridge CFStringRef)type)) {
+ // This is already a UTI.
+ return type;
+ }
+
+ return toUTI(type);
+}
+
</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">@@ -46,7 +57,7 @@
</span><span class="cx"> [pasteboardItem setString:plainText->text forType:NSPasteboardTypeString];
</span><span class="cx"> if (plainText->canSmartCopyOrDelete) {
</span><span class="cx"> auto smartPasteType = adoptNS((__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)_NXSmartPaste, nullptr));
</span><del>- [pasteboardItem setData:nil forType:smartPasteType.get()];
</del><ins>+ [pasteboardItem setData:[NSData data] forType:smartPasteType.get()];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -83,6 +94,28 @@
</span><span class="cx"> [pasteboardItem setString:userVisibleString forType:NSPasteboardTypeString];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (auto& webContent = data.webContent()) {
+ if (webContent->canSmartCopyOrDelete) {
+ auto smartPasteType = adoptNS((__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)_NXSmartPaste, nullptr));
+ [pasteboardItem setData:[NSData data] forType:smartPasteType.get()];
+ }
+ if (webContent->dataInWebArchiveFormat) {
+ auto webArchiveType = adoptNS((__bridge NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)@"Apple Web Archive pasteboard type", nullptr));
+ [pasteboardItem setData:webContent->dataInWebArchiveFormat->createNSData().get() forType:webArchiveType.get()];
+ }
+ if (webContent->dataInRTFDFormat)
+ [pasteboardItem setData:webContent->dataInRTFDFormat->createNSData().get() forType:NSPasteboardTypeRTFD];
+ if (webContent->dataInRTFFormat)
+ [pasteboardItem setData:webContent->dataInRTFFormat->createNSData().get() forType:NSPasteboardTypeRTF];
+ if (!webContent->dataInHTMLFormat.isNull())
+ [pasteboardItem setString:webContent->dataInHTMLFormat forType:NSPasteboardTypeHTML];
+ if (!webContent->dataInStringFormat.isNull())
+ [pasteboardItem setString:webContent->dataInStringFormat forType:NSPasteboardTypeString];
+
+ for (unsigned i = 0; i < webContent->clientTypes.size(); ++i)
+ [pasteboardItem setData:webContent->clientData[i]->createNSData().get() forType:toUTIUnlessAlreadyUTI(webContent->clientTypes[i]).get()];
+ }
+
</ins><span class="cx"> return pasteboardItem;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>