<!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>[177805] 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/177805">177805</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 11:35:48 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move WebPasteboardProxy from Shared to UIProcess, where it should have been all along
Rubber-stamped by Anders Carlsson.
* Shared/WebPasteboardProxy.cpp: Removed.
* Shared/WebPasteboardProxy.h: Removed.
* Shared/WebPasteboardProxy.messages.in: Removed.
* UIProcess/WebPasteboardProxy.cpp: Copied from Shared/WebPasteboardProxy.cpp.
* UIProcess/WebPasteboardProxy.h: Copied from Shared/WebPasteboardProxy.h.
* UIProcess/WebPasteboardProxy.messages.in: Copied from Shared/WebPasteboardProxy.messages.in.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebPasteboardProxycpp">trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp</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>
</ul>
<h3>Removed 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177804 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-12-29 19:29:26 UTC (rev 177804)
+++ trunk/Source/WebKit2/ChangeLog        2014-12-29 19:35:48 UTC (rev 177805)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-12-29 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ Move WebPasteboardProxy from Shared to UIProcess, where it should have been all along
+ Rubber-stamped by Anders Carlsson.
+
+ * Shared/WebPasteboardProxy.cpp: Removed.
+ * Shared/WebPasteboardProxy.h: Removed.
+ * Shared/WebPasteboardProxy.messages.in: Removed.
+ * UIProcess/WebPasteboardProxy.cpp: Copied from Shared/WebPasteboardProxy.cpp.
+ * UIProcess/WebPasteboardProxy.h: Copied from Shared/WebPasteboardProxy.h.
+ * UIProcess/WebPasteboardProxy.messages.in: Copied from Shared/WebPasteboardProxy.messages.in.
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2014-12-29 Sam Weinig <sam@webkit.org>
+
</ins><span class="cx"> Try to fix the iOS build.
</span><span class="cx">
</span><span class="cx"> * Shared/WebPasteboardProxy.h:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPasteboardProxycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp (177804 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp        2014-12-29 19:29:26 UTC (rev 177804)
+++ trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp        2014-12-29 19:35:48 UTC (rev 177805)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPasteboardProxyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebPasteboardProxy.h (177804 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPasteboardProxy.h        2014-12-29 19:29:26 UTC (rev 177804)
+++ trunk/Source/WebKit2/Shared/WebPasteboardProxy.h        2014-12-29 19:35:48 UTC (rev 177805)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
- * 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;
-struct PasteboardImage;
-struct PasteboardWebContent;
-}
-
-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
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPasteboardProxymessagesin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in (177804 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in        2014-12-29 19:29:26 UTC (rev 177804)
+++ trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in        2014-12-29 19:35:48 UTC (rev 177805)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-# 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
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPasteboardProxycppfromrev177796trunkSourceWebKit2SharedWebPasteboardProxycpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp (from rev 177796, trunk/Source/WebKit2/Shared/WebPasteboardProxy.cpp) (0 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.cpp        2014-12-29 19:35:48 UTC (rev 177805)
</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="trunkSourceWebKit2UIProcessWebPasteboardProxyhfromrev177804trunkSourceWebKit2SharedWebPasteboardProxyh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h (from rev 177804, trunk/Source/WebKit2/Shared/WebPasteboardProxy.h) (0 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.h        2014-12-29 19:35:48 UTC (rev 177805)
</span><span class="lines">@@ -0,0 +1,88 @@
</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;
+struct PasteboardImage;
+struct PasteboardWebContent;
+}
+
+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="trunkSourceWebKit2UIProcessWebPasteboardProxymessagesinfromrev177796trunkSourceWebKit2SharedWebPasteboardProxymessagesin"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in (from rev 177796, trunk/Source/WebKit2/Shared/WebPasteboardProxy.messages.in) (0 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebPasteboardProxy.messages.in        2014-12-29 19:35:48 UTC (rev 177805)
</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="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177804 => 177805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-12-29 19:29:26 UTC (rev 177804)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-12-29 19:35:48 UTC (rev 177805)
</span><span class="lines">@@ -1053,11 +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><del>-                7C4694C31A4B4B0400AD5845 /* WebPasteboardProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694C11A4B4B0400AD5845 /* WebPasteboardProxy.cpp */; };
-                7C4694C41A4B4B0400AD5845 /* WebPasteboardProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694C21A4B4B0400AD5845 /* WebPasteboardProxy.h */; };
</del><span class="cx">                 7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694C71A4B4EA000AD5845 /* WebPasteboardProxyMessageReceiver.cpp */; };
</span><span class="cx">                 7C4694CA1A4B4EA100AD5845 /* WebPasteboardProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694C81A4B4EA100AD5845 /* WebPasteboardProxyMessages.h */; };
</span><span class="cx">                 7C4694CC1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */; };
</span><ins>+                7C4694D01A51E36800AD5845 /* WebPasteboardProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694CD1A51E36800AD5845 /* WebPasteboardProxy.cpp */; };
+                7C4694D11A51E36800AD5845 /* WebPasteboardProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694CE1A51E36800AD5845 /* WebPasteboardProxy.h */; };
</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">@@ -3147,12 +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><del>-                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>"; };
</del><span class="cx">                 7C4694C71A4B4EA000AD5845 /* WebPasteboardProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPasteboardProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 7C4694C81A4B4EA100AD5845 /* WebPasteboardProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx">                 7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardProxyCocoa.mm; sourceTree = "<group>"; };
</span><ins>+                7C4694CD1A51E36800AD5845 /* WebPasteboardProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPasteboardProxy.cpp; sourceTree = "<group>"; };
+                7C4694CE1A51E36800AD5845 /* WebPasteboardProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardProxy.h; sourceTree = "<group>"; };
+                7C4694CF1A51E36800AD5845 /* WebPasteboardProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPasteboardProxy.messages.in; 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">@@ -4582,9 +4582,6 @@
</span><span class="cx">                                 C06C6094124C14430001682F /* WebPageCreationParameters.h */,
</span><span class="cx">                                 BC7B625112A43C9600D174A4 /* WebPageGroupData.cpp */,
</span><span class="cx">                                 BC7B625012A43C9600D174A4 /* WebPageGroupData.h */,
</span><del>-                                7C4694C11A4B4B0400AD5845 /* WebPasteboardProxy.cpp */,
-                                7C4694C21A4B4B0400AD5845 /* WebPasteboardProxy.h */,
-                                7C4694C51A4B4B8500AD5845 /* WebPasteboardProxy.messages.in */,
</del><span class="cx">                                 C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */,
</span><span class="cx">                                 BC5744ED12638FB3006F0F12 /* WebPopupItem.cpp */,
</span><span class="cx">                                 BC5744EE12638FB3006F0F12 /* WebPopupItem.h */,
</span><span class="lines">@@ -6000,6 +5997,9 @@
</span><span class="cx">                                 BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
</span><span class="cx">                                 BC032DCB10F4389F0058C15A /* WebPageProxy.h */,
</span><span class="cx">                                 BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */,
</span><ins>+                                7C4694CD1A51E36800AD5845 /* WebPasteboardProxy.cpp */,
+                                7C4694CE1A51E36800AD5845 /* WebPasteboardProxy.h */,
+                                7C4694CF1A51E36800AD5845 /* WebPasteboardProxy.messages.in */,
</ins><span class="cx">                                 BC574E611267D080006F0F12 /* WebPopupMenuProxy.h */,
</span><span class="cx">                                 BCD597FE112B57BE00EC8C23 /* WebPreferences.cpp */,
</span><span class="cx">                                 BCD597FD112B57BE00EC8C23 /* WebPreferences.h */,
</span><span class="lines">@@ -7388,7 +7388,6 @@
</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><del>-                                7C4694C41A4B4B0400AD5845 /* WebPasteboardProxy.h in Headers */,
</del><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">@@ -7751,6 +7750,7 @@
</span><span class="cx">                                 0FCB4E4818BBE044000FCFC9 /* WKActionSheet.h in Headers */,
</span><span class="cx">                                 0FCB4E4A18BBE044000FCFC9 /* WKActionSheetAssistant.h in Headers */,
</span><span class="cx">                                 C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */,
</span><ins>+                                7C4694D11A51E36800AD5845 /* WebPasteboardProxy.h in Headers */,
</ins><span class="cx">                                 BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
</span><span class="cx">                                 512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */,
</span><span class="cx">                                 BC4075F4124FF0270068F20A /* WKArray.h in Headers */,
</span><span class="lines">@@ -8962,6 +8962,7 @@
</span><span class="cx">                                 1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
</span><span class="cx">                                 1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
</span><span class="cx">                                 1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */,
</span><ins>+                                7C4694D01A51E36800AD5845 /* WebPasteboardProxy.cpp in Sources */,
</ins><span class="cx">                                 1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */,
</span><span class="cx">                                 E179FD9F134D38250015B883 /* ArgumentCodersMac.mm in Sources */,
</span><span class="cx">                                 BC032DA510F437D10058C15A /* ArgumentDecoder.cpp in Sources */,
</span><span class="lines">@@ -9058,7 +9059,6 @@
</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><del>-                                7C4694C31A4B4B0400AD5845 /* WebPasteboardProxy.cpp in Sources */,
</del><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></pre>
</div>
</div>
</body>
</html>