<!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>[177794] trunk/Source/WebKit2</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/177794">177794</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 10:23:44 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move Pasteboard code out of WebProcessPool and into its own singleton class
https://bugs.webkit.org/show_bug.cgi?id=139987
Reviewed by Anders Carlsson.
* DerivedSources.make:
* Shared/WebPasteboardProxy.cpp: Added.
(WebKit::WebPasteboardProxy::shared):
(WebKit::WebPasteboardProxy::WebPasteboardProxy):
(WebKit::WebPasteboardProxy::addWebProcessProxy):
* Shared/WebPasteboardProxy.h: Added.
* Shared/WebPasteboardProxy.messages.in: Added.
* UIProcess/Cocoa/WebPasteboardProxyCocoa.mm: Added.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::didReceiveSyncMessage):
(WebKit::WebProcessPool::dummy): Deleted.
* UIProcess/WebProcessPool.h:
* UIProcess/WebProcessPool.messages.in:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::WebProcessProxy):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::writeItemsToPasteboard):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolmessagesin">trunk/Source/WebKit2/UIProcess/WebProcessPool.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebPasteboardProxycpp">trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPasteboardProxyh">trunk/Source/WebKit2/Shared/WebPasteboardProxy.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPasteboardProxymessagesin">trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-12-29 Sam Weinig <sam@webkit.org>
+
+ Move Pasteboard code out of WebProcessPool and into its own singleton class
+ https://bugs.webkit.org/show_bug.cgi?id=139987
+
+ Reviewed by Anders Carlsson.
+
+ * DerivedSources.make:
+ * Shared/WebPasteboardProxy.cpp: Added.
+ (WebKit::WebPasteboardProxy::shared):
+ (WebKit::WebPasteboardProxy::WebPasteboardProxy):
+ (WebKit::WebPasteboardProxy::addWebProcessProxy):
+ * Shared/WebPasteboardProxy.h: Added.
+ * Shared/WebPasteboardProxy.messages.in: Added.
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm: Added.
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::didReceiveSyncMessage):
+ (WebKit::WebProcessPool::dummy): Deleted.
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebProcessPool.messages.in:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::WebProcessProxy):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::writeItemsToPasteboard):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+
</ins><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use UserData for bundle initialization data
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DerivedSources.make 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/DerivedSources.make 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> WebPage \
</span><span class="cx"> WebPageGroupProxy \
</span><span class="cx"> WebPageProxy \
</span><ins>+ WebPasteboardProxy \
</ins><span class="cx"> WebProcess \
</span><span class="cx"> WebProcessConnection \
</span><span class="cx"> WebProcessPool \
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPasteboardProxycpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp (0 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebPasteboardProxy.h"
+
+#include "WebPasteboardProxyMessages.h"
+#include "WebProcessProxy.h"
+#include <mutex>
+
+namespace WebKit {
+
+WebPasteboardProxy& WebPasteboardProxy::shared()
+{
+ static std::once_flag onceFlag;
+ static LazyNeverDestroyed<WebPasteboardProxy> proxy;
+
+ std::call_once(onceFlag, [] {
+ proxy.construct();
+ });
+
+ return proxy;
+}
+
+WebPasteboardProxy::WebPasteboardProxy()
+{
+}
+
+void WebPasteboardProxy::addWebProcessProxy(WebProcessProxy& webProcessProxy)
+{
+ // FIXME: Can we handle all of these on a background queue?
+ webProcessProxy.addMessageReceiver(Messages::WebPasteboardProxy::messageReceiverName(), *this);
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPasteboardProxyh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/WebPasteboardProxy.h (0 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPasteboardProxy.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebPasteboardProxy.h 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -0,0 +1,86 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPasteboardProxy_h
+#define WebPasteboardProxy_h
+
+#include "MessageReceiver.h"
+#include "SharedMemory.h"
+#include <wtf/Forward.h>
+#include <wtf/NeverDestroyed.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+class Color;
+}
+
+namespace WebKit {
+
+class WebProcessProxy;
+
+class WebPasteboardProxy : public IPC::MessageReceiver {
+ WTF_MAKE_NONCOPYABLE(WebPasteboardProxy);
+ friend class LazyNeverDestroyed<WebPasteboardProxy>;
+public:
+ static WebPasteboardProxy& shared();
+
+ void addWebProcessProxy(WebProcessProxy&);
+
+private:
+ WebPasteboardProxy();
+
+ virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
+
+#if PLATFORM(IOS)
+ 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);
+#endif
+#if PLATFORM(COCOA)
+ void getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes);
+ void getPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, Vector<String>& pathnames);
+ void getPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, String&);
+ void getPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, SharedMemory::Handle&, uint64_t& size);
+ void pasteboardCopy(const String& fromPasteboard, const String& toPasteboard, uint64_t& newChangeCount);
+ void getPasteboardChangeCount(const String& pasteboardName, uint64_t& changeCount);
+ void getPasteboardUniqueName(String& pasteboardName);
+ void getPasteboardColor(const String& pasteboardName, WebCore::Color&);
+ void getPasteboardURL(const String& pasteboardName, WTF::String&);
+ void addPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount);
+ void setPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount);
+ void setPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount);
+ void setPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, const String&, uint64_t& newChangeCount);
+ void setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle&, uint64_t size, uint64_t& newChangeCount);
+#endif
+};
+
+} // namespace WebKit
+
+#endif // WebPasteboardProxy_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPasteboardProxymessagesin"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in (0 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in (rev 0)
+++ trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+messages -> WebPasteboardProxy {
+#if PLATFORM(IOS)
+ 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)
+#endif
+
+#if PLATFORM(COCOA)
+ # Pasteboard messages.
+ GetPasteboardTypes(String pasteboardName) -> (Vector<String> types)
+ GetPasteboardPathnamesForType(String pasteboardName, String pasteboardType) -> (Vector<String> pathnames)
+ GetPasteboardStringForType(String pasteboardName, String pasteboardType) -> (String string)
+ GetPasteboardBufferForType(String pasteboardName, String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
+ PasteboardCopy(String fromPasteboard, String toPasteboard) -> (uint64_t changeCount)
+ GetPasteboardChangeCount(String pasteboardName) -> (uint64_t changeCount)
+ GetPasteboardUniqueName() -> (String pasteboardName)
+ GetPasteboardColor(String pasteboardName) -> (WebCore::Color color)
+ GetPasteboardURL(String pasteboardName) -> (String urlString)
+ AddPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
+ SetPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
+ SetPasteboardPathnamesForType(String pasteboardName, String pasteboardType, Vector<String> pathnames) -> (uint64_t changeCount)
+ SetPasteboardStringForType(String pasteboardName, String pasteboardType, String string) -> (uint64_t changeCount)
+ SetPasteboardBufferForType(String pasteboardName, String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size) -> (uint64_t changeCount)
+#endif
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (0 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WebPasteboardProxy.h"
+
+#import <WebCore/Color.h>
+#import <WebCore/PlatformPasteboard.h>
+#import <WebCore/SharedBuffer.h>
+#import <WebCore/URL.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebPasteboardProxy::getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes)
+{
+ PlatformPasteboard(pasteboardName).getTypes(pasteboardTypes);
+}
+
+void WebPasteboardProxy::getPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, Vector<String>& pathnames)
+{
+ PlatformPasteboard(pasteboardName).getPathnamesForType(pathnames, pasteboardType);
+}
+
+void WebPasteboardProxy::getPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, String& string)
+{
+ string = PlatformPasteboard(pasteboardName).stringForType(pasteboardType);
+}
+
+void WebPasteboardProxy::getPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, SharedMemory::Handle& handle, uint64_t& size)
+{
+ RefPtr<SharedBuffer> buffer = PlatformPasteboard(pasteboardName).bufferForType(pasteboardType);
+ if (!buffer)
+ return;
+ size = buffer->size();
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
+ if (!sharedMemoryBuffer)
+ return;
+ memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+}
+
+void WebPasteboardProxy::pasteboardCopy(const String& fromPasteboard, const String& toPasteboard, uint64_t& newChangeCount)
+{
+ newChangeCount = PlatformPasteboard(toPasteboard).copy(fromPasteboard);
+}
+
+void WebPasteboardProxy::getPasteboardChangeCount(const String& pasteboardName, uint64_t& changeCount)
+{
+ changeCount = PlatformPasteboard(pasteboardName).changeCount();
+}
+
+void WebPasteboardProxy::getPasteboardUniqueName(String& pasteboardName)
+{
+ pasteboardName = PlatformPasteboard::uniqueName();
+}
+
+void WebPasteboardProxy::getPasteboardColor(const String& pasteboardName, WebCore::Color& color)
+{
+ color = PlatformPasteboard(pasteboardName).color();
+}
+
+void WebPasteboardProxy::getPasteboardURL(const String& pasteboardName, WTF::String& urlString)
+{
+ urlString = PlatformPasteboard(pasteboardName).url().string();
+}
+
+void WebPasteboardProxy::addPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount)
+{
+ newChangeCount = PlatformPasteboard(pasteboardName).addTypes(pasteboardTypes);
+}
+
+void WebPasteboardProxy::setPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount)
+{
+ newChangeCount = PlatformPasteboard(pasteboardName).setTypes(pasteboardTypes);
+}
+
+void WebPasteboardProxy::setPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount)
+{
+ newChangeCount = PlatformPasteboard(pasteboardName).setPathnamesForType(pathnames, pasteboardType);
+}
+
+void WebPasteboardProxy::setPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, const String& string, uint64_t& newChangeCount)
+{
+ newChangeCount = PlatformPasteboard(pasteboardName).setStringForType(string, pasteboardType);
+}
+
+void WebPasteboardProxy::setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle& handle, uint64_t size, uint64_t& newChangeCount)
+{
+ if (handle.isNull()) {
+ newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(0, pasteboardType);
+ return;
+ }
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
+ newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
+}
+
+#if PLATFORM(IOS)
+void WebPasteboardProxy::writeWebContentToPasteboard(const WebCore::PasteboardWebContent& content)
+{
+ PlatformPasteboard().write(content);
+}
+
+void WebPasteboardProxy::writeImageToPasteboard(const WebCore::PasteboardImage& pasteboardImage)
+{
+ PlatformPasteboard().write(pasteboardImage);
+}
+
+void WebPasteboardProxy::writeStringToPasteboard(const String& pasteboardType, const String& text)
+{
+ PlatformPasteboard().write(pasteboardType, text);
+}
+
+void WebPasteboardProxy::readStringFromPasteboard(uint64_t index, const String& pasteboardType, WTF::String& value)
+{
+ value = PlatformPasteboard().readString(index, pasteboardType);
+}
+
+void WebPasteboardProxy::readURLFromPasteboard(uint64_t index, const String& pasteboardType, String& url)
+{
+ url = PlatformPasteboard().readURL(index, pasteboardType);
+}
+
+void WebPasteboardProxy::readBufferFromPasteboard(uint64_t index, const String& pasteboardType, SharedMemory::Handle& handle, uint64_t& size)
+{
+ RefPtr<SharedBuffer> buffer = PlatformPasteboard().readBuffer(index, pasteboardType);
+ if (!buffer)
+ return;
+ size = buffer->size();
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
+ if (!sharedMemoryBuffer)
+ return;
+ memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+}
+
+void WebPasteboardProxy::getPasteboardItemsCount(uint64_t& itemsCount)
+{
+ itemsCount = PlatformPasteboard().count();
+}
+
+#endif
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -382,136 +382,6 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessPool::getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes)
-{
- PlatformPasteboard(pasteboardName).getTypes(pasteboardTypes);
-}
-
-void WebProcessPool::getPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, Vector<String>& pathnames)
-{
- PlatformPasteboard(pasteboardName).getPathnamesForType(pathnames, pasteboardType);
-}
-
-void WebProcessPool::getPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, String& string)
-{
- string = PlatformPasteboard(pasteboardName).stringForType(pasteboardType);
-}
-
-void WebProcessPool::getPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, SharedMemory::Handle& handle, uint64_t& size)
-{
- RefPtr<SharedBuffer> buffer = PlatformPasteboard(pasteboardName).bufferForType(pasteboardType);
- if (!buffer)
- return;
- size = buffer->size();
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
- if (!sharedMemoryBuffer)
- return;
- memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
-}
-
-void WebProcessPool::pasteboardCopy(const String& fromPasteboard, const String& toPasteboard, uint64_t& newChangeCount)
-{
- newChangeCount = PlatformPasteboard(toPasteboard).copy(fromPasteboard);
-}
-
-void WebProcessPool::getPasteboardChangeCount(const String& pasteboardName, uint64_t& changeCount)
-{
- changeCount = PlatformPasteboard(pasteboardName).changeCount();
-}
-
-void WebProcessPool::getPasteboardUniqueName(String& pasteboardName)
-{
- pasteboardName = PlatformPasteboard::uniqueName();
-}
-
-void WebProcessPool::getPasteboardColor(const String& pasteboardName, WebCore::Color& color)
-{
- color = PlatformPasteboard(pasteboardName).color();
-}
-
-void WebProcessPool::getPasteboardURL(const String& pasteboardName, WTF::String& urlString)
-{
- urlString = PlatformPasteboard(pasteboardName).url().string();
-}
-
-void WebProcessPool::addPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount)
-{
- newChangeCount = PlatformPasteboard(pasteboardName).addTypes(pasteboardTypes);
-}
-
-void WebProcessPool::setPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount)
-{
- newChangeCount = PlatformPasteboard(pasteboardName).setTypes(pasteboardTypes);
-}
-
-void WebProcessPool::setPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount)
-{
- newChangeCount = PlatformPasteboard(pasteboardName).setPathnamesForType(pathnames, pasteboardType);
-}
-
-void WebProcessPool::setPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, const String& string, uint64_t& newChangeCount)
-{
- newChangeCount = PlatformPasteboard(pasteboardName).setStringForType(string, pasteboardType);
-}
-
-void WebProcessPool::setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle& handle, uint64_t size, uint64_t& newChangeCount)
-{
- if (handle.isNull()) {
- newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(0, pasteboardType);
- return;
- }
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
- RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
- newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
-}
-
-#if PLATFORM(IOS)
-void WebProcessPool::writeWebContentToPasteboard(const WebCore::PasteboardWebContent& content)
-{
- PlatformPasteboard().write(content);
-}
-
-void WebProcessPool::writeImageToPasteboard(const WebCore::PasteboardImage& pasteboardImage)
-{
- PlatformPasteboard().write(pasteboardImage);
-}
-
-void WebProcessPool::writeStringToPasteboard(const String& pasteboardType, const String& text)
-{
- PlatformPasteboard().write(pasteboardType, text);
-}
-
-void WebProcessPool::readStringFromPasteboard(uint64_t index, const String& pasteboardType, WTF::String& value)
-{
- value = PlatformPasteboard().readString(index, pasteboardType);
-}
-
-void WebProcessPool::readURLFromPasteboard(uint64_t index, const String& pasteboardType, String& url)
-{
- url = PlatformPasteboard().readURL(index, pasteboardType);
-}
-
-void WebProcessPool::readBufferFromPasteboard(uint64_t index, const String& pasteboardType, SharedMemory::Handle& handle, uint64_t& size)
-{
- RefPtr<SharedBuffer> buffer = PlatformPasteboard().readBuffer(index, pasteboardType);
- if (!buffer)
- return;
- size = buffer->size();
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
- if (!sharedMemoryBuffer)
- return;
- memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
-}
-
-void WebProcessPool::getPasteboardItemsCount(uint64_t& itemsCount)
-{
- itemsCount = PlatformPasteboard().count();
-}
-
-#endif
-
</del><span class="cx"> bool WebProcessPool::processSuppressionEnabled() const
</span><span class="cx"> {
</span><span class="cx"> return !m_userObservablePageCounter.value() && !m_processSuppressionDisabledForPageCounter.value();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -376,32 +376,6 @@
</span><span class="cx"> void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- 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);
-#endif
-#if PLATFORM(COCOA)
- void getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes);
- void getPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, Vector<String>& pathnames);
- void getPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, String&);
- void getPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, SharedMemory::Handle&, uint64_t& size);
- void pasteboardCopy(const String& fromPasteboard, const String& toPasteboard, uint64_t& newChangeCount);
- void getPasteboardChangeCount(const String& pasteboardName, uint64_t& changeCount);
- void getPasteboardUniqueName(String& pasteboardName);
- void getPasteboardColor(const String& pasteboardName, WebCore::Color&);
- void getPasteboardURL(const String& pasteboardName, WTF::String&);
- void addPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount);
- void setPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, uint64_t& newChangeCount);
- void setPasteboardPathnamesForType(const String& pasteboardName, const String& pasteboardType, const Vector<String>& pathnames, uint64_t& newChangeCount);
- void setPasteboardStringForType(const String& pasteboardName, const String& pasteboardType, const String&, uint64_t& newChangeCount);
- void setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle&, uint64_t size, uint64_t& newChangeCount);
-#endif
-
</del><span class="cx"> void handleMessage(IPC::Connection*, const String& messageName, const UserData& messageBody);
</span><span class="cx"> void handleSynchronousMessage(IPC::Connection*, const String& messageName, const UserData& messageBody, UserData& returnUserData);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.messages.in (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.messages.in 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.messages.in 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -26,40 +26,6 @@
</span><span class="cx">
</span><span class="cx"> DidGetStatistics(struct WebKit::StatisticsData statisticsData, uint64_t callbackID)
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- 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)
-#endif
-
-#if PLATFORM(COCOA)
- # Pasteboard messages.
- GetPasteboardTypes(String pasteboardName) -> (Vector<String> types)
- GetPasteboardPathnamesForType(String pasteboardName, String pasteboardType) -> (Vector<String> pathnames)
- GetPasteboardStringForType(String pasteboardName, String pasteboardType) -> (String string)
- GetPasteboardBufferForType(String pasteboardName, String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size)
- PasteboardCopy(String fromPasteboard, String toPasteboard) -> (uint64_t changeCount)
- GetPasteboardChangeCount(String pasteboardName) -> (uint64_t changeCount)
- GetPasteboardUniqueName() -> (String pasteboardName)
- GetPasteboardColor(String pasteboardName) -> (WebCore::Color color)
- GetPasteboardURL(String pasteboardName) -> (String urlString)
- AddPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
- SetPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (uint64_t changeCount)
- SetPasteboardPathnamesForType(String pasteboardName, String pasteboardType, Vector<String> pathnames) -> (uint64_t changeCount)
- SetPasteboardStringForType(String pasteboardName, String pasteboardType, String string) -> (uint64_t changeCount)
- SetPasteboardBufferForType(String pasteboardName, String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size) -> (uint64_t changeCount)
-#endif
-
-#if !PLATFORM(COCOA)
- // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
- // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
- Dummy() -> (bool dummyReturn)
-#endif
-
</del><span class="cx"> # Plug-in messages.
</span><span class="cx"> void AddPlugInAutoStartOriginHash(String pageOrigin, uint32_t hash, WebCore::SessionID sessionID)
</span><span class="cx"> void PlugInDidReceiveUserInteraction(uint32_t hash, WebCore::SessionID sessionID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -37,17 +37,18 @@
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><span class="cx"> #include "UserData.h"
</span><del>-#include "WebUserContentControllerProxy.h"
</del><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx"> #include "WebInspectorProxy.h"
</span><span class="cx"> #include "WebNavigationDataStore.h"
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span><span class="cx"> #include "WebPageGroup.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><ins>+#include "WebPasteboardProxy.h"
</ins><span class="cx"> #include "WebPluginSiteDataManager.h"
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><ins>+#include "WebUserContentControllerProxy.h"
</ins><span class="cx"> #include <WebCore/SuddenTermination.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="lines">@@ -98,6 +99,8 @@
</span><span class="cx"> , m_numberOfTimesSuddenTerminationWasDisabled(0)
</span><span class="cx"> , m_throttler(std::make_unique<ProcessThrottler>(this))
</span><span class="cx"> {
</span><ins>+ WebPasteboardProxy::shared().addWebProcessProxy(*this);
+
</ins><span class="cx"> connect();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -1053,6 +1053,11 @@
</span><span class="cx"> 7C387434172F5615001BD88A /* PageBanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C387433172F5615001BD88A /* PageBanner.cpp */; };
</span><span class="cx"> 7C3F8C90173AF52D007B7F39 /* PluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */; };
</span><span class="cx"> 7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */; };
</span><ins>+ 7C4694C31A4B4B0400AD5845 /* WebPasteboardProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694C11A4B4B0400AD5845 /* WebPasteboardProxy.cpp */; };
+ 7C4694C41A4B4B0400AD5845 /* WebPasteboardProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694C21A4B4B0400AD5845 /* WebPasteboardProxy.h */; };
+ 7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694C71A4B4EA000AD5845 /* WebPasteboardProxyMessageReceiver.cpp */; };
+ 7C4694CA1A4B4EA100AD5845 /* WebPasteboardProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694C81A4B4EA100AD5845 /* WebPasteboardProxyMessages.h */; };
+ 7C4694CC1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */; };
</ins><span class="cx"> 7C4ED3291A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ED3271A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h */; };
</span><span class="cx"> 7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */; };
</span><span class="cx"> 7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */; };
</span><span class="lines">@@ -3142,6 +3147,12 @@
</span><span class="cx"> 7C387433172F5615001BD88A /* PageBanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageBanner.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginInformation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInformation.h; sourceTree = "<group>"; };
</span><ins>+ 7C4694C11A4B4B0400AD5845 /* WebPasteboardProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPasteboardProxy.cpp; sourceTree = "<group>"; };
+ 7C4694C21A4B4B0400AD5845 /* WebPasteboardProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardProxy.h; sourceTree = "<group>"; };
+ 7C4694C51A4B4B8500AD5845 /* WebPasteboardProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPasteboardProxy.messages.in; sourceTree = "<group>"; };
+ 7C4694C71A4B4EA000AD5845 /* WebPasteboardProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPasteboardProxyMessageReceiver.cpp; sourceTree = "<group>"; };
+ 7C4694C81A4B4EA100AD5845 /* WebPasteboardProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardProxyMessages.h; sourceTree = "<group>"; };
+ 7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardProxyCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 7C4ED3261A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleCSSStyleDeclarationHandle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C4ED3271A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleCSSStyleDeclarationHandle.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageBannerMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -4571,6 +4582,9 @@
</span><span class="cx"> C06C6094124C14430001682F /* WebPageCreationParameters.h */,
</span><span class="cx"> BC7B625112A43C9600D174A4 /* WebPageGroupData.cpp */,
</span><span class="cx"> BC7B625012A43C9600D174A4 /* WebPageGroupData.h */,
</span><ins>+ 7C4694C11A4B4B0400AD5845 /* WebPasteboardProxy.cpp */,
+ 7C4694C21A4B4B0400AD5845 /* WebPasteboardProxy.h */,
+ 7C4694C51A4B4B8500AD5845 /* WebPasteboardProxy.messages.in */,
</ins><span class="cx"> C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */,
</span><span class="cx"> BC5744ED12638FB3006F0F12 /* WebPopupItem.cpp */,
</span><span class="cx"> BC5744EE12638FB3006F0F12 /* WebPopupItem.h */,
</span><span class="lines">@@ -4683,6 +4697,7 @@
</span><span class="cx"> 1AFE436318B6C081009C7A48 /* UIDelegate.mm */,
</span><span class="cx"> 1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */,
</span><span class="cx"> 7CE4D2151A49148400C7F152 /* WebProcessPoolCocoa.mm */,
</span><ins>+ 7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */,
</ins><span class="cx"> 1A04F6171A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm */,
</span><span class="cx"> 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */,
</span><span class="cx"> 1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */,
</span><span class="lines">@@ -6998,6 +7013,8 @@
</span><span class="cx"> C0CE729F1247E71D00BC0EC4 /* WebPageMessages.h */,
</span><span class="cx"> BCBD3912125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp */,
</span><span class="cx"> BCBD3913125BB1A800D2C29F /* WebPageProxyMessages.h */,
</span><ins>+ 7C4694C71A4B4EA000AD5845 /* WebPasteboardProxyMessageReceiver.cpp */,
+ 7C4694C81A4B4EA100AD5845 /* WebPasteboardProxyMessages.h */,
</ins><span class="cx"> 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */,
</span><span class="cx"> 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */,
</span><span class="cx"> BC3066BC125A442100E71278 /* WebProcessMessageReceiver.cpp */,
</span><span class="lines">@@ -7358,6 +7375,7 @@
</span><span class="cx"> BC14E10A120B905E00826C0C /* InjectedBundlePageFormClient.h in Headers */,
</span><span class="cx"> CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */,
</span><span class="cx"> BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */,
</span><ins>+ 7C4694CA1A4B4EA100AD5845 /* WebPasteboardProxyMessages.h in Headers */,
</ins><span class="cx"> BC8147A912F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h in Headers */,
</span><span class="cx"> BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */,
</span><span class="cx"> BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
</span><span class="lines">@@ -7370,6 +7388,7 @@
</span><span class="cx"> 518353DF1887128B00D9FE44 /* KeyedDecoder.h in Headers */,
</span><span class="cx"> 1AE00D5D182DADE100087DD7 /* KeyedEncoder.h in Headers */,
</span><span class="cx"> BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */,
</span><ins>+ 7C4694C41A4B4B0400AD5845 /* WebPasteboardProxy.h in Headers */,
</ins><span class="cx"> 0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */,
</span><span class="cx"> 1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */,
</span><span class="cx"> 1A1DC340196346D700FF7059 /* LegacySessionStateCoding.h in Headers */,
</span><span class="lines">@@ -9039,6 +9058,7 @@
</span><span class="cx"> E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */,
</span><span class="cx"> BC14E109120B905E00826C0C /* InjectedBundlePageFormClient.cpp in Sources */,
</span><span class="cx"> CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */,
</span><ins>+ 7C4694C31A4B4B0400AD5845 /* WebPasteboardProxy.cpp in Sources */,
</ins><span class="cx"> BCA8C6A811E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp in Sources */,
</span><span class="cx"> BC8147AA12F64CDA007B2C32 /* InjectedBundlePagePolicyClient.cpp in Sources */,
</span><span class="cx"> 659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources */,
</span><span class="lines">@@ -9123,6 +9143,7 @@
</span><span class="cx"> 1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */,
</span><span class="cx"> 1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
</span><span class="cx"> 1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
</span><ins>+ 7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */,
</ins><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
</span><span class="cx"> BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */,
</span><span class="cx"> BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
</span><span class="lines">@@ -9346,6 +9367,7 @@
</span><span class="cx"> BC0E5FE612D697160012A72A /* WebGeolocationManager.cpp in Sources */,
</span><span class="cx"> BC0E606112D6BA910012A72A /* WebGeolocationManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC54CACC12D64291005C67B0 /* WebGeolocationManagerProxy.cpp in Sources */,
</span><ins>+ 7C4694CC1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm in Sources */,
</ins><span class="cx"> BC0E618212D6CB1D0012A72A /* WebGeolocationManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
</span><span class="cx"> BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> #import "WebEventConversion.h"
</span><span class="cx"> #import "WebPage.h"
</span><span class="cx"> #import "WebPageProxyMessages.h"
</span><ins>+#import "WebPasteboardProxyMessages.h"
</ins><span class="cx"> #import "WebProcess.h"
</span><del>-#import "WebProcessPoolMessages.h"
</del><span class="cx"> #import <JavaScriptCore/JSContextRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSObjectRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRef.h>
</span><span class="lines">@@ -1662,8 +1662,8 @@
</span><span class="cx"> pasteboardTypes.append(type);
</span><span class="cx">
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardTypes(pasteboardName, pasteboardTypes),
- Messages::WebProcessPool::SetPasteboardTypes::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardTypes(pasteboardName, pasteboardTypes),
+ Messages::WebPasteboardProxy::SetPasteboardTypes::Reply(newChangeCount), 0);
</ins><span class="cx">
</span><span class="cx"> for (NSUInteger i = 0, count = items.count; i < count; ++i) {
</span><span class="cx"> NSString *type = [types objectAtIndex:i];
</span><span class="lines">@@ -1677,8 +1677,7 @@
</span><span class="cx">
</span><span class="cx"> if ([type isEqualToString:NSStringPboardType] || [type isEqualToString:NSPasteboardTypeString]) {
</span><span class="cx"> RetainPtr<NSString> plainTextString = adoptNS([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardStringForType(pasteboardName, type, plainTextString.get()),
- Messages::WebProcessPool::SetPasteboardStringForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardStringForType(pasteboardName, type, plainTextString.get()), Messages::WebPasteboardProxy::SetPasteboardStringForType::Reply(newChangeCount), 0);
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::wrapNSData(data);
</span><span class="cx">
</span><span class="lines">@@ -1689,8 +1688,7 @@
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory = SharedMemory::create(buffer->size());
</span><span class="cx"> memcpy(sharedMemory->data(), buffer->data(), buffer->size());
</span><span class="cx"> sharedMemory->createHandle(handle, SharedMemory::ReadOnly);
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()),
- Messages::WebProcessPool::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (177793 => 177794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-12-29 18:11:49 UTC (rev 177793)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-12-29 18:23:44 UTC (rev 177794)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> #include "WebIDBFactoryBackend.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPasteboardOverrides.h"
</span><ins>+#include "WebPasteboardProxyMessages.h"
</ins><span class="cx"> #include "WebProcess.h"
</span><del>-#include "WebProcessPoolMessages.h"
</del><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <WebCore/IDBFactoryBackendInterface.h>
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> if (!types.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardTypes(pasteboardName), Messages::WebProcessPool::GetPasteboardTypes::Reply(types), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardTypes(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardTypes::Reply(types), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebCore::SharedBuffer> WebPlatformStrategies::bufferForType(const String& pasteboardType, const String& pasteboardName)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> // Fallback to messaging the UI process for native pasteboard content.
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardBufferForType(pasteboardName, pasteboardType), Messages::WebProcessPool::GetPasteboardBufferForType::Reply(handle, size), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardBufferForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardBufferForType::Reply(handle, size), 0);
</ins><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</span><span class="lines">@@ -361,62 +361,62 @@
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardPathnamesForType(pasteboardName, pasteboardType), Messages::WebProcessPool::GetPasteboardPathnamesForType::Reply(pathnames), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardPathnamesForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardPathnamesForType::Reply(pathnames), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::stringForType(const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> String value;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardStringForType(pasteboardName, pasteboardType), Messages::WebProcessPool::GetPasteboardStringForType::Reply(value), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardStringForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardStringForType::Reply(value), 0);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::copy(const String& fromPasteboard, const String& toPasteboard)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::PasteboardCopy(fromPasteboard, toPasteboard), Messages::WebProcessPool::PasteboardCopy::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::PasteboardCopy(fromPasteboard, toPasteboard), Messages::WebPasteboardProxy::PasteboardCopy::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::changeCount(const WTF::String &pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t changeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardChangeCount(pasteboardName), Messages::WebProcessPool::GetPasteboardChangeCount::Reply(changeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
</ins><span class="cx"> return changeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::uniqueName()
</span><span class="cx"> {
</span><span class="cx"> String pasteboardName;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardUniqueName(), Messages::WebProcessPool::GetPasteboardUniqueName::Reply(pasteboardName), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardUniqueName(), Messages::WebPasteboardProxy::GetPasteboardUniqueName::Reply(pasteboardName), 0);
</ins><span class="cx"> return pasteboardName;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color WebPlatformStrategies::color(const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> Color color;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardColor(pasteboardName), Messages::WebProcessPool::GetPasteboardColor::Reply(color), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardColor(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardColor::Reply(color), 0);
</ins><span class="cx"> return color;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL WebPlatformStrategies::url(const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> String urlString;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardURL(pasteboardName), Messages::WebProcessPool::GetPasteboardURL::Reply(urlString), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardURL(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardURL::Reply(urlString), 0);
</ins><span class="cx"> return URL(ParsedURLString, urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::AddPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebProcessPool::AddPasteboardTypes::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::AddPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebPasteboardProxy::AddPasteboardTypes::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebProcessPool::SetPasteboardTypes::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardTypes(pasteboardName, pasteboardTypes), Messages::WebPasteboardProxy::SetPasteboardTypes::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -433,44 +433,44 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardBufferForType(pasteboardName, pasteboardType, handle, buffer ? buffer->size() : 0), Messages::WebProcessPool::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, pasteboardType, handle, buffer ? buffer->size() : 0), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardPathnamesForType(pasteboardName, pasteboardType, pathnames), Messages::WebProcessPool::SetPasteboardPathnamesForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardPathnamesForType(pasteboardName, pasteboardType, pathnames), Messages::WebPasteboardProxy::SetPasteboardPathnamesForType::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::setStringForType(const String& string, const String& pasteboardType, const String& pasteboardName)
</span><span class="cx"> {
</span><span class="cx"> uint64_t newChangeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::SetPasteboardStringForType(pasteboardName, pasteboardType, string), Messages::WebProcessPool::SetPasteboardStringForType::Reply(newChangeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardStringForType(pasteboardName, pasteboardType, string), Messages::WebPasteboardProxy::SetPasteboardStringForType::Reply(newChangeCount), 0);
</ins><span class="cx"> return newChangeCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardWebContent& content)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessPool::WriteWebContentToPasteboard(content), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteWebContentToPasteboard(content), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::writeToPasteboard(const WebCore::PasteboardImage& image)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessPool::WriteImageToPasteboard(image), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteImageToPasteboard(image), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::writeToPasteboard(const String& pasteboardType, const String& text)
</span><span class="cx"> {
</span><del>- WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessPool::WriteStringToPasteboard(pasteboardType, text), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteStringToPasteboard(pasteboardType, text), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int WebPlatformStrategies::getPasteboardItemsCount()
</span><span class="cx"> {
</span><span class="cx"> uint64_t itemsCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardItemsCount(), Messages::WebProcessPool::GetPasteboardItemsCount::Reply(itemsCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardItemsCount(), Messages::WebPasteboardProxy::GetPasteboardItemsCount::Reply(itemsCount), 0);
</ins><span class="cx"> return itemsCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> {
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebProcessPool::ReadBufferFromPasteboard::Reply(handle, size), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
</ins><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</span><span class="lines">@@ -488,21 +488,21 @@
</span><span class="cx"> WebCore::URL WebPlatformStrategies::readURLFromPasteboard(int index, const String& pasteboardType)
</span><span class="cx"> {
</span><span class="cx"> String urlString;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::ReadURLFromPasteboard(index, pasteboardType), Messages::WebProcessPool::ReadURLFromPasteboard::Reply(urlString), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadURLFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadURLFromPasteboard::Reply(urlString), 0);
</ins><span class="cx"> return URL(ParsedURLString, urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::readStringFromPasteboard(int index, const String& pasteboardType)
</span><span class="cx"> {
</span><span class="cx"> String value;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::ReadStringFromPasteboard(index, pasteboardType), Messages::WebProcessPool::ReadStringFromPasteboard::Reply(value), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadStringFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadStringFromPasteboard::Reply(value), 0);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long WebPlatformStrategies::changeCount()
</span><span class="cx"> {
</span><span class="cx"> uint64_t changeCount;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessPool::GetPasteboardChangeCount(String()), Messages::WebProcessPool::GetPasteboardChangeCount::Reply(changeCount), 0);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(String()), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
</ins><span class="cx"> return changeCount;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>