<!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>[211158] trunk/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/211158">211158</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 12:16:17 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for named pasteboards, pasteboard strategies and platform pasteboards
https://bugs.webkit.org/show_bug.cgi?id=167404
Reviewed by Enrica Casucci.
Source/WebCore:
Refactors some pasteboard-related code to plumb the name of the pasteboard across from WebCore to the client
layer. No new tests, because there should be no change in behavior.
* platform/DragData.h:
* platform/Pasteboard.h:
* platform/PasteboardStrategy.h:
* platform/PlatformPasteboard.h:
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::Pasteboard):
(WebCore::Pasteboard::write):
(WebCore::Pasteboard::writePlainText):
(WebCore::Pasteboard::read):
(WebCore::Pasteboard::hasData):
(WebCore::Pasteboard::clear):
(WebCore::Pasteboard::readString):
(WebCore::Pasteboard::writeString):
(WebCore::Pasteboard::types):
Source/WebKit/mac:
Adds pasteboard name as an argument to pasteboard-related WebPlatformStrategy methods.
* WebCoreSupport/WebPlatformStrategies.h:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::writeToPasteboard):
(WebPlatformStrategies::getPasteboardItemsCount):
(WebPlatformStrategies::readBufferFromPasteboard):
(WebPlatformStrategies::readURLFromPasteboard):
(WebPlatformStrategies::readStringFromPasteboard):
Source/WebKit2:
Adds support for delivering the pasteboard name to the UI process when writing to or reading from the pasteboard.
* UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
(WebKit::WebPasteboardProxy::writeWebContentToPasteboard):
(WebKit::WebPasteboardProxy::writeImageToPasteboard):
(WebKit::WebPasteboardProxy::writeStringToPasteboard):
(WebKit::WebPasteboardProxy::readStringFromPasteboard):
(WebKit::WebPasteboardProxy::readURLFromPasteboard):
(WebKit::WebPasteboardProxy::readBufferFromPasteboard):
(WebKit::WebPasteboardProxy::getPasteboardItemsCount):
* UIProcess/WebPasteboardProxy.h:
* UIProcess/WebPasteboardProxy.messages.in:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::writeToPasteboard):
(WebKit::WebPlatformStrategies::getPasteboardItemsCount):
(WebKit::WebPlatformStrategies::readBufferFromPasteboard):
(WebKit::WebPlatformStrategies::readURLFromPasteboard):
(WebKit::WebPlatformStrategies::readStringFromPasteboard):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformDragDatah">trunk/Source/WebCore/platform/DragData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardStrategyh">trunk/Source/WebCore/platform/PasteboardStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformPasteboardh">trunk/Source/WebCore/platform/PlatformPasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxyh">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebCore/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Add support for named pasteboards, pasteboard strategies and platform pasteboards
+ https://bugs.webkit.org/show_bug.cgi?id=167404
+
+ Reviewed by Enrica Casucci.
+
+ Refactors some pasteboard-related code to plumb the name of the pasteboard across from WebCore to the client
+ layer. No new tests, because there should be no change in behavior.
+
+ * platform/DragData.h:
+ * platform/Pasteboard.h:
+ * platform/PasteboardStrategy.h:
+ * platform/PlatformPasteboard.h:
+ * platform/ios/PasteboardIOS.mm:
+ (WebCore::Pasteboard::Pasteboard):
+ (WebCore::Pasteboard::write):
+ (WebCore::Pasteboard::writePlainText):
+ (WebCore::Pasteboard::read):
+ (WebCore::Pasteboard::hasData):
+ (WebCore::Pasteboard::clear):
+ (WebCore::Pasteboard::readString):
+ (WebCore::Pasteboard::writeString):
+ (WebCore::Pasteboard::types):
+
</ins><span class="cx"> 2017-01-25 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> LayoutTest media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html is flaky
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragData.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragData.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebCore/platform/DragData.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> unsigned numberOfFiles() const;
</span><span class="cx"> void setFileNames(Vector<String>& fileNames) { m_fileNames = WTFMove(fileNames); }
</span><span class="cx"> const Vector<String>& fileNames() const { return m_fileNames; }
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> const String& pasteboardName() const { return m_pasteboardName; }
</span><span class="cx"> bool containsPromise() const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> DragOperation m_draggingSourceOperationMask;
</span><span class="cx"> DragApplicationFlags m_applicationFlags;
</span><span class="cx"> Vector<String> m_fileNames;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String m_pasteboardName;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> static String resourceMIMEType(const NSString *mimeType);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> explicit Pasteboard(const String& pasteboardName);
</span><span class="cx">
</span><span class="cx"> const String& name() const { return m_pasteboardName; }
</span><span class="lines">@@ -231,11 +231,7 @@
</span><span class="cx"> String m_name;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- long m_changeCount;
-#endif
-
-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> String m_pasteboardName;
</span><span class="cx"> long m_changeCount;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PasteboardStrategy.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebCore/platform/PasteboardStrategy.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -42,15 +42,13 @@
</span><span class="cx"> class PasteboardStrategy {
</span><span class="cx"> public:
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: We should move Mac to this.
- virtual void writeToPasteboard(const PasteboardWebContent&) = 0;
- virtual void writeToPasteboard(const PasteboardImage&) = 0;
- virtual void writeToPasteboard(const String& pasteboardType, const String&) = 0;
- virtual int getPasteboardItemsCount() = 0;
- virtual String readStringFromPasteboard(int index, const String& pasteboardType) = 0;
- virtual RefPtr<SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType) = 0;
- virtual URL readURLFromPasteboard(int index, const String& pasteboardType) = 0;
- virtual long changeCount() = 0;
</del><ins>+ virtual void writeToPasteboard(const PasteboardWebContent&, const String& pasteboardName) = 0;
+ virtual void writeToPasteboard(const PasteboardImage&, const String& pasteboardName) = 0;
+ virtual void writeToPasteboard(const String& pasteboardType, const String&, const String& pasteboardName) = 0;
+ virtual int getPasteboardItemsCount(const String& pasteboardName) = 0;
+ virtual String readStringFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) = 0;
+ virtual RefPtr<SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) = 0;
+ virtual URL readURLFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) = 0;
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void getTypes(Vector<String>& types, const String& pasteboardName) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> class PlatformPasteboard {
</span><span class="cx"> public:
</span><del>- // FIXME: probably we don't need a constructor that takes a pasteboard name for iOS.
</del><span class="cx"> WEBCORE_EXPORT explicit PlatformPasteboard(const String& pasteboardName);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WEBCORE_EXPORT PlatformPasteboard();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Pasteboard::Pasteboard()
</span><del>- : m_changeCount(platformStrategies()->pasteboardStrategy()->changeCount())
</del><ins>+ : m_changeCount(platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardWebContent& content)
</span><span class="cx"> {
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(content);
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(content, m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Pasteboard::resourceMIMEType(const NSString *mimeType)
</span><span class="lines">@@ -112,17 +112,17 @@
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardImage& pasteboardImage)
</span><span class="cx"> {
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(pasteboardImage);
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(pasteboardImage, m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writePlainText(const String& text, SmartReplaceOption)
</span><span class="cx"> {
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(kUTTypeText, text);
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(kUTTypeText, text, m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardURL& pasteboardURL)
</span><span class="cx"> {
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(kUTTypeURL, pasteboardURL.url.string());
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(kUTTypeURL, pasteboardURL.url.string(), m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::writeTrustworthyWebURLsPboardType(const PasteboardURL&)
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx"> void Pasteboard::read(PasteboardPlainText& text)
</span><span class="cx"> {
</span><span class="cx"> PasteboardStrategy& strategy = *platformStrategies()->pasteboardStrategy();
</span><del>- text.text = strategy.readStringFromPasteboard(0, kUTTypeText);
</del><ins>+ text.text = strategy.readStringFromPasteboard(0, kUTTypeText, m_pasteboardName);
</ins><span class="cx"> if (text.text.isEmpty())
</span><del>- text.text = strategy.readStringFromPasteboard(0, kUTTypeURL);
</del><ins>+ text.text = strategy.readStringFromPasteboard(0, kUTTypeURL, m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSArray* supportedImageTypes()
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> {
</span><span class="cx"> PasteboardStrategy& strategy = *platformStrategies()->pasteboardStrategy();
</span><span class="cx">
</span><del>- int numberOfItems = strategy.getPasteboardItemsCount();
</del><ins>+ int numberOfItems = strategy.getPasteboardItemsCount(m_pasteboardName);
</ins><span class="cx">
</span><span class="cx"> if (!numberOfItems)
</span><span class="cx"> return;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> NSString *type = [types objectAtIndex:typeIndex];
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:WebArchivePboardType]) {
</span><del>- if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, WebArchivePboardType)) {
</del><ins>+ if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, WebArchivePboardType, m_pasteboardName)) {
</ins><span class="cx"> if (reader.readWebArchive(buffer.get()))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -180,13 +180,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:(NSString *)kUTTypeHTML]) {
</span><del>- String htmlString = strategy.readStringFromPasteboard(i, kUTTypeHTML);
</del><ins>+ String htmlString = strategy.readStringFromPasteboard(i, kUTTypeHTML, m_pasteboardName);
</ins><span class="cx"> if (!htmlString.isNull() && reader.readHTML(htmlString))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:(NSString *)kUTTypeFlatRTFD]) {
</span><del>- if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, kUTTypeFlatRTFD)) {
</del><ins>+ if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, kUTTypeFlatRTFD, m_pasteboardName)) {
</ins><span class="cx"> if (reader.readRTFD(*buffer))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:(NSString *)kUTTypeRTF]) {
</span><del>- if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, kUTTypeRTF)) {
</del><ins>+ if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, kUTTypeRTF, m_pasteboardName)) {
</ins><span class="cx"> if (reader.readRTF(*buffer))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([supportedImageTypes() containsObject:type]) {
</span><del>- if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, type)) {
</del><ins>+ if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(i, type, m_pasteboardName)) {
</ins><span class="cx"> if (reader.readImage(buffer.releaseNonNull(), type))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -207,13 +207,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:(NSString *)kUTTypeURL]) {
</span><del>- URL url = strategy.readURLFromPasteboard(i, kUTTypeURL);
</del><ins>+ URL url = strategy.readURLFromPasteboard(i, kUTTypeURL, m_pasteboardName);
</ins><span class="cx"> if (!url.isNull() && reader.readURL(url, String()))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:(NSString *)kUTTypeText]) {
</span><del>- String string = strategy.readStringFromPasteboard(i, kUTTypeText);
</del><ins>+ String string = strategy.readStringFromPasteboard(i, kUTTypeText, m_pasteboardName);
</ins><span class="cx"> if (!string.isNull() && reader.readPlainText(string))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> bool Pasteboard::hasData()
</span><span class="cx"> {
</span><del>- return platformStrategies()->pasteboardStrategy()->getPasteboardItemsCount() != 0;
</del><ins>+ return !!platformStrategies()->pasteboardStrategy()->getPasteboardItemsCount(m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String utiTypeFromCocoaType(NSString *type)
</span><span class="lines">@@ -273,12 +273,12 @@
</span><span class="cx"> if (!cocoaType)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(cocoaType.get(), String());
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(cocoaType.get(), String(), m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::clear()
</span><span class="cx"> {
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(String(), String());
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(String(), String(), m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Pasteboard::readString(const String& type)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> {
</span><span class="cx"> PasteboardStrategy& strategy = *platformStrategies()->pasteboardStrategy();
</span><span class="cx">
</span><del>- int numberOfItems = strategy.getPasteboardItemsCount();
</del><ins>+ int numberOfItems = strategy.getPasteboardItemsCount(m_pasteboardName);
</ins><span class="cx">
</span><span class="cx"> if (!numberOfItems)
</span><span class="cx"> return String();
</span><span class="lines">@@ -296,21 +296,21 @@
</span><span class="cx"> NSString *cocoaValue = nil;
</span><span class="cx">
</span><span class="cx"> if ([cocoaType isEqualToString:(NSString *)kUTTypeURL]) {
</span><del>- URL url = strategy.readURLFromPasteboard(0, kUTTypeURL);
</del><ins>+ URL url = strategy.readURLFromPasteboard(0, kUTTypeURL, m_pasteboardName);
</ins><span class="cx"> if (!url.isNull())
</span><span class="cx"> cocoaValue = [(NSURL *)url absoluteString];
</span><span class="cx"> } else if ([cocoaType isEqualToString:(NSString *)kUTTypeText]) {
</span><del>- String value = strategy.readStringFromPasteboard(0, kUTTypeText);
</del><ins>+ String value = strategy.readStringFromPasteboard(0, kUTTypeText, m_pasteboardName);
</ins><span class="cx"> if (!value.isNull())
</span><span class="cx"> cocoaValue = [(NSString *)value precomposedStringWithCanonicalMapping];
</span><span class="cx"> } else if (cocoaType) {
</span><del>- if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(0, cocoaType.get()))
</del><ins>+ if (RefPtr<SharedBuffer> buffer = strategy.readBufferFromPasteboard(0, cocoaType.get(), m_pasteboardName))
</ins><span class="cx"> cocoaValue = [[[NSString alloc] initWithData:buffer->createNSData().get() encoding:NSUTF8StringEncoding] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Enforce changeCount ourselves for security. We check after reading instead of before to be
</span><span class="cx"> // sure it doesn't change between our testing the change count and accessing the data.
</span><del>- if (cocoaValue && m_changeCount == platformStrategies()->pasteboardStrategy()->changeCount())
</del><ins>+ if (cocoaValue && m_changeCount == platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName))
</ins><span class="cx"> return cocoaValue;
</span><span class="cx">
</span><span class="cx"> return String();
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> if (!cocoaType)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- platformStrategies()->pasteboardStrategy()->writeToPasteboard(type, data);
</del><ins>+ platformStrategies()->pasteboardStrategy()->writeToPasteboard(type, data, m_pasteboardName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> Pasteboard::types()
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">
</span><span class="cx"> // Enforce changeCount ourselves for security. We check after reading instead of before to be
</span><span class="cx"> // sure it doesn't change between our testing the change count and accessing the data.
</span><del>- if (m_changeCount != platformStrategies()->pasteboardStrategy()->changeCount())
</del><ins>+ if (m_changeCount != platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> ListHashSet<String> result;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Add support for named pasteboards, pasteboard strategies and platform pasteboards
+ https://bugs.webkit.org/show_bug.cgi?id=167404
+
+ Reviewed by Enrica Casucci.
+
+ Adds pasteboard name as an argument to pasteboard-related WebPlatformStrategy methods.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::writeToPasteboard):
+ (WebPlatformStrategies::getPasteboardItemsCount):
+ (WebPlatformStrategies::readBufferFromPasteboard):
+ (WebPlatformStrategies::readURLFromPasteboard):
+ (WebPlatformStrategies::readStringFromPasteboard):
+
</ins><span class="cx"> 2017-01-25 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> LoadWebLocalizedStrings method should be moved in correct file
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -59,14 +59,13 @@
</span><span class="cx">
</span><span class="cx"> // WebCore::PasteboardStrategy
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void writeToPasteboard(const WebCore::PasteboardWebContent&) override;
- void writeToPasteboard(const WebCore::PasteboardImage&) override;
- void writeToPasteboard(const String& pasteboardType, const String&) override;
- int getPasteboardItemsCount() override;
- String readStringFromPasteboard(int index, const String& pasteboardType) override;
- RefPtr<WebCore::SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType) override;
- WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType) override;
- long changeCount() override;
</del><ins>+ void writeToPasteboard(const WebCore::PasteboardWebContent&, const String& pasteboardName) override;
+ void writeToPasteboard(const WebCore::PasteboardImage&, const String& pasteboardName) override;
+ void writeToPasteboard(const String& pasteboardType, const String&, const String& pasteboardName) override;
+ int getPasteboardItemsCount(const String& pasteboardName) override;
+ String readStringFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
+ RefPtr<WebCore::SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
+ WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
</ins><span class="cx"> #endif
</span><span class="cx"> void getTypes(Vector<String>& types, const String& pasteboardName) override;
</span><span class="cx"> RefPtr<WebCore::SharedBuffer> bufferForType(const String& pasteboardType, const String& pasteboardName) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -186,43 +186,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardWebContent& content)
</del><ins>+void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardWebContent& content, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PlatformPasteboard().write(content);
</del><ins>+ PlatformPasteboard(pasteboardName).write(content);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardImage& image)
</del><ins>+void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardImage& image, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PlatformPasteboard().write(image);
</del><ins>+ PlatformPasteboard(pasteboardName).write(image);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlatformStrategies::writeToPasteboard(const String& pasteboardType, const String& text)
</del><ins>+void WebPlatformStrategies::writeToPasteboard(const String& pasteboardType, const String& text, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PlatformPasteboard().write(pasteboardType, text);
</del><ins>+ PlatformPasteboard(pasteboardName).write(pasteboardType, text);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-int WebPlatformStrategies::getPasteboardItemsCount()
</del><ins>+int WebPlatformStrategies::getPasteboardItemsCount(const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- return PlatformPasteboard().count();
</del><ins>+ return PlatformPasteboard(pasteboardName).count();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebCore::SharedBuffer> WebPlatformStrategies::readBufferFromPasteboard(int index, const String& type)
</del><ins>+RefPtr<WebCore::SharedBuffer> WebPlatformStrategies::readBufferFromPasteboard(int index, const String& type, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- return PlatformPasteboard().readBuffer(index, type);
</del><ins>+ return PlatformPasteboard(pasteboardName).readBuffer(index, type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::URL WebPlatformStrategies::readURLFromPasteboard(int index, const String& type)
</del><ins>+WebCore::URL WebPlatformStrategies::readURLFromPasteboard(int index, const String& type, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- return PlatformPasteboard().readURL(index, type);
</del><ins>+ return PlatformPasteboard(pasteboardName).readURL(index, type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String WebPlatformStrategies::readStringFromPasteboard(int index, const String& type)
</del><ins>+String WebPlatformStrategies::readStringFromPasteboard(int index, const String& type, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- return PlatformPasteboard().readString(index, type);
</del><ins>+ return PlatformPasteboard(pasteboardName).readString(index, type);
</ins><span class="cx"> }
</span><del>-
-long WebPlatformStrategies::changeCount()
-{
- return PlatformPasteboard().changeCount();
-}
</del><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-01-25 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Add support for named pasteboards, pasteboard strategies and platform pasteboards
+ https://bugs.webkit.org/show_bug.cgi?id=167404
+
+ Reviewed by Enrica Casucci.
+
+ Adds support for delivering the pasteboard name to the UI process when writing to or reading from the pasteboard.
+
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+ (WebKit::WebPasteboardProxy::writeWebContentToPasteboard):
+ (WebKit::WebPasteboardProxy::writeImageToPasteboard):
+ (WebKit::WebPasteboardProxy::writeStringToPasteboard):
+ (WebKit::WebPasteboardProxy::readStringFromPasteboard):
+ (WebKit::WebPasteboardProxy::readURLFromPasteboard):
+ (WebKit::WebPasteboardProxy::readBufferFromPasteboard):
+ (WebKit::WebPasteboardProxy::getPasteboardItemsCount):
+ * UIProcess/WebPasteboardProxy.h:
+ * UIProcess/WebPasteboardProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::writeToPasteboard):
+ (WebKit::WebPlatformStrategies::getPasteboardItemsCount):
+ (WebKit::WebPlatformStrategies::readBufferFromPasteboard):
+ (WebKit::WebPlatformStrategies::readURLFromPasteboard):
+ (WebKit::WebPlatformStrategies::readStringFromPasteboard):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2017-01-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Icon Database should be in private browsing mode for ephemeral web views
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -135,34 +135,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-void WebPasteboardProxy::writeWebContentToPasteboard(const WebCore::PasteboardWebContent& content)
</del><ins>+void WebPasteboardProxy::writeWebContentToPasteboard(const WebCore::PasteboardWebContent& content, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PlatformPasteboard().write(content);
</del><ins>+ PlatformPasteboard(pasteboardName).write(content);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::writeImageToPasteboard(const WebCore::PasteboardImage& pasteboardImage)
</del><ins>+void WebPasteboardProxy::writeImageToPasteboard(const WebCore::PasteboardImage& pasteboardImage, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PlatformPasteboard().write(pasteboardImage);
</del><ins>+ PlatformPasteboard(pasteboardName).write(pasteboardImage);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::writeStringToPasteboard(const String& pasteboardType, const String& text)
</del><ins>+void WebPasteboardProxy::writeStringToPasteboard(const String& pasteboardType, const String& text, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- PlatformPasteboard().write(pasteboardType, text);
</del><ins>+ PlatformPasteboard(pasteboardName).write(pasteboardType, text);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::readStringFromPasteboard(uint64_t index, const String& pasteboardType, WTF::String& value)
</del><ins>+void WebPasteboardProxy::readStringFromPasteboard(uint64_t index, const String& pasteboardType, const String& pasteboardName, WTF::String& value)
</ins><span class="cx"> {
</span><del>- value = PlatformPasteboard().readString(index, pasteboardType);
</del><ins>+ value = PlatformPasteboard(pasteboardName).readString(index, pasteboardType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::readURLFromPasteboard(uint64_t index, const String& pasteboardType, String& url)
</del><ins>+void WebPasteboardProxy::readURLFromPasteboard(uint64_t index, const String& pasteboardType, const String& pasteboardName, String& url)
</ins><span class="cx"> {
</span><del>- url = PlatformPasteboard().readURL(index, pasteboardType);
</del><ins>+ url = PlatformPasteboard(pasteboardName).readURL(index, pasteboardType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::readBufferFromPasteboard(uint64_t index, const String& pasteboardType, SharedMemory::Handle& handle, uint64_t& size)
</del><ins>+void WebPasteboardProxy::readBufferFromPasteboard(uint64_t index, const String& pasteboardType, const String& pasteboardName, SharedMemory::Handle& handle, uint64_t& size)
</ins><span class="cx"> {
</span><del>- RefPtr<SharedBuffer> buffer = PlatformPasteboard().readBuffer(index, pasteboardType);
</del><ins>+ RefPtr<SharedBuffer> buffer = PlatformPasteboard(pasteboardName).readBuffer(index, pasteboardType);
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return;
</span><span class="cx"> size = buffer->size();
</span><span class="lines">@@ -173,9 +173,9 @@
</span><span class="cx"> sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPasteboardProxy::getPasteboardItemsCount(uint64_t& itemsCount)
</del><ins>+void WebPasteboardProxy::getPasteboardItemsCount(const String& pasteboardName, uint64_t& itemsCount)
</ins><span class="cx"> {
</span><del>- itemsCount = PlatformPasteboard().count();
</del><ins>+ itemsCount = PlatformPasteboard(pasteboardName).count();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPasteboardProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -68,13 +68,13 @@
</span><span class="cx"> void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void writeWebContentToPasteboard(const WebCore::PasteboardWebContent&);
- void writeImageToPasteboard(const WebCore::PasteboardImage&);
- void writeStringToPasteboard(const String& pasteboardType, const String&);
- void readStringFromPasteboard(uint64_t index, const String& pasteboardType, WTF::String&);
- void readURLFromPasteboard(uint64_t index, const String& pasteboardType, String&);
- void readBufferFromPasteboard(uint64_t index, const String& pasteboardType, SharedMemory::Handle&, uint64_t& size);
- void getPasteboardItemsCount(uint64_t& itemsCount);
</del><ins>+ void writeWebContentToPasteboard(const WebCore::PasteboardWebContent&, const String& pasteboardName);
+ void writeImageToPasteboard(const WebCore::PasteboardImage&, const String& pasteboardName);
+ void writeStringToPasteboard(const String& pasteboardType, const String&, const String& pasteboardName);
+ void readStringFromPasteboard(uint64_t index, const String& pasteboardType, const String& pasteboardName, WTF::String&);
+ void readURLFromPasteboard(uint64_t index, const String& pasteboardType, const String& pasteboardName, String&);
+ void readBufferFromPasteboard(uint64_t index, const String& pasteboardType, const String& pasteboardName, SharedMemory::Handle&, uint64_t& size);
+ void getPasteboardItemsCount(const String& pasteboardName, uint64_t& itemsCount);
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPasteboardProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -22,13 +22,13 @@
</span><span class="cx">
</span><span class="cx"> messages -> WebPasteboardProxy {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- WriteWebContentToPasteboard(struct WebCore::PasteboardWebContent content)
- WriteImageToPasteboard(struct WebCore::PasteboardImage pasteboardImage)
- WriteStringToPasteboard(String pasteboardType, String text)
- ReadStringFromPasteboard(uint64_t index, String pasteboardType) -> (String string)
- ReadURLFromPasteboard(uint64_t index, String pasteboardType) -> (String string)
- ReadBufferFromPasteboard(uint64_t index, String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
- GetPasteboardItemsCount() -> (uint64_t itemsCount)
</del><ins>+ WriteWebContentToPasteboard(struct WebCore::PasteboardWebContent content, String pasteboardName)
+ WriteImageToPasteboard(struct WebCore::PasteboardImage pasteboardImage, String pasteboardName)
+ WriteStringToPasteboard(String pasteboardType, String text, String pasteboardName)
+ ReadStringFromPasteboard(uint64_t index, String pasteboardType, String pasteboardName) -> (String string)
+ ReadURLFromPasteboard(uint64_t index, String pasteboardType, String pasteboardName) -> (String string)
+ ReadBufferFromPasteboard(uint64_t index, String pasteboardType, String pasteboardName) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
+ GetPasteboardItemsCount(String pasteboardName) -> (uint64_t itemsCount)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -285,33 +285,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardWebContent& content)
</del><ins>+void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardWebContent& content, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteWebContentToPasteboard(content), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteWebContentToPasteboard(content, pasteboardName), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardImage& image)
</del><ins>+void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardImage& image, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteImageToPasteboard(image), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteImageToPasteboard(image, pasteboardName), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlatformStrategies::writeToPasteboard(const String& pasteboardType, const String& text)
</del><ins>+void WebPlatformStrategies::writeToPasteboard(const String& pasteboardType, const String& text, const String& pasteboardName)
</ins><span class="cx"> {
</span><del>- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteStringToPasteboard(pasteboardType, text), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteStringToPasteboard(pasteboardType, text, pasteboardName), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-int WebPlatformStrategies::getPasteboardItemsCount()
</del><ins>+int WebPlatformStrategies::getPasteboardItemsCount(const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t itemsCount;
</span><del>- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardItemsCount(), Messages::WebPasteboardProxy::GetPasteboardItemsCount::Reply(itemsCount), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardItemsCount(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardItemsCount::Reply(itemsCount), 0);
</ins><span class="cx"> return itemsCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebCore::SharedBuffer> WebPlatformStrategies::readBufferFromPasteboard(int index, const String& pasteboardType)
</del><ins>+RefPtr<WebCore::SharedBuffer> WebPlatformStrategies::readBufferFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><del>- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType, pasteboardName), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
</ins><span class="cx"> if (handle.isNull())
</span><span class="cx"> return nullptr;
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
</span><span class="lines">@@ -318,27 +318,19 @@
</span><span class="cx"> return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::URL WebPlatformStrategies::readURLFromPasteboard(int index, const String& pasteboardType)
</del><ins>+WebCore::URL WebPlatformStrategies::readURLFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> String urlString;
</span><del>- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadURLFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadURLFromPasteboard::Reply(urlString), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadURLFromPasteboard(index, pasteboardType, pasteboardName), Messages::WebPasteboardProxy::ReadURLFromPasteboard::Reply(urlString), 0);
</ins><span class="cx"> return URL(ParsedURLString, urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebPlatformStrategies::readStringFromPasteboard(int index, const String& pasteboardType)
</del><ins>+String WebPlatformStrategies::readStringFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName)
</ins><span class="cx"> {
</span><span class="cx"> String value;
</span><del>- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadStringFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadStringFromPasteboard::Reply(value), 0);
</del><ins>+ WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadStringFromPasteboard(index, pasteboardType, pasteboardName), Messages::WebPasteboardProxy::ReadStringFromPasteboard::Reply(value), 0);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><del>-
-long WebPlatformStrategies::changeCount()
-{
- uint64_t changeCount;
- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(String()), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
- return changeCount;
-}
-
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (211157 => 211158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2017-01-25 20:04:30 UTC (rev 211157)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2017-01-25 20:16:17 UTC (rev 211158)
</span><span class="lines">@@ -60,14 +60,13 @@
</span><span class="cx">
</span><span class="cx"> // WebCore::PasteboardStrategy
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void writeToPasteboard(const WebCore::PasteboardWebContent&) override;
- void writeToPasteboard(const WebCore::PasteboardImage&) override;
- void writeToPasteboard(const String& pasteboardType, const String&) override;
- int getPasteboardItemsCount() override;
- String readStringFromPasteboard(int index, const String& pasteboardType) override;
- RefPtr<WebCore::SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType) override;
- WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType) override;
- long changeCount() override;
</del><ins>+ void writeToPasteboard(const WebCore::PasteboardWebContent&, const String& pasteboardName) override;
+ void writeToPasteboard(const WebCore::PasteboardImage&, const String& pasteboardName) override;
+ void writeToPasteboard(const String& pasteboardType, const String&, const String& pasteboardName) override;
+ int getPasteboardItemsCount(const String& pasteboardName) override;
+ String readStringFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
+ RefPtr<WebCore::SharedBuffer> readBufferFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
+ WebCore::URL readURLFromPasteboard(int index, const String& pasteboardType, const String& pasteboardName) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void getTypes(Vector<String>& types, const String& pasteboardName) override;
</span></span></pre>
</div>
</div>
</body>
</html>