Diff
Modified: trunk/Source/WebKit/ChangeLog (254523 => 254524)
--- trunk/Source/WebKit/ChangeLog 2020-01-14 20:00:45 UTC (rev 254523)
+++ trunk/Source/WebKit/ChangeLog 2020-01-14 20:03:32 UTC (rev 254524)
@@ -1,3 +1,16 @@
+2020-01-14 Ross Kirsling <[email protected]>
+
+ WebPasteboardProxyWPE should be WebPasteboardProxyLibWPE
+ https://bugs.webkit.org/show_bug.cgi?id=206243
+
+ Reviewed by Adrian Perez de Castro.
+
+ WebPasteboardProxy.h already has USE(LIBWPE) so we basically just need to move the file.
+
+ * SourcesWPE.txt:
+ * UIProcess/WebPasteboardProxy.cpp:
+ * UIProcess/libwpe/WebPasteboardProxyLibWPE.cpp: Renamed from Source/WebKit/UIProcess/wpe/WebPasteboardProxyWPE.cpp.
+
2020-01-14 Eric Carlson <[email protected]>
Nake MediaPlayerPrivateRemoteProxy a message receiver
Modified: trunk/Source/WebKit/SourcesWPE.txt (254523 => 254524)
--- trunk/Source/WebKit/SourcesWPE.txt 2020-01-14 20:00:45 UTC (rev 254523)
+++ trunk/Source/WebKit/SourcesWPE.txt 2020-01-14 20:03:32 UTC (rev 254524)
@@ -206,6 +206,8 @@
UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp
UIProcess/gstreamer/WebPageProxyGStreamer.cpp
+UIProcess/libwpe/WebPasteboardProxyLibWPE.cpp
+
UIProcess/linux/MemoryPressureMonitor.cpp
UIProcess/soup/WebCookieManagerProxySoup.cpp
@@ -213,7 +215,6 @@
UIProcess/wpe/WebInspectorProxyWPE.cpp
UIProcess/wpe/WebPageProxyWPE.cpp
-UIProcess/wpe/WebPasteboardProxyWPE.cpp
WebProcess/InjectedBundle/API/glib/DOM/DOMObjectCache.cpp @no-unify
WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMDocument.cpp @no-unify
Modified: trunk/Source/WebKit/UIProcess/WebPasteboardProxy.cpp (254523 => 254524)
--- trunk/Source/WebKit/UIProcess/WebPasteboardProxy.cpp 2020-01-14 20:00:45 UTC (rev 254523)
+++ trunk/Source/WebKit/UIProcess/WebPasteboardProxy.cpp 2020-01-14 20:03:32 UTC (rev 254524)
@@ -105,7 +105,7 @@
completionHandler({ }, 0);
}
-#if !PLATFORM(WPE)
+#if !USE(LIBWPE)
void WebPasteboardProxy::readStringFromPasteboard(size_t, const String&, const String&, CompletionHandler<void(String&&)>&& completionHandler)
{
@@ -112,7 +112,7 @@
completionHandler({ });
}
-#endif // !PLATFORM(WPE)
+#endif // !USE(LIBWPE)
#endif // !PLATFORM(COCOA)
Copied: trunk/Source/WebKit/UIProcess/libwpe/WebPasteboardProxyLibWPE.cpp (from rev 254523, trunk/Source/WebKit/UIProcess/wpe/WebPasteboardProxyWPE.cpp) (0 => 254524)
--- trunk/Source/WebKit/UIProcess/libwpe/WebPasteboardProxyLibWPE.cpp (rev 0)
+++ trunk/Source/WebKit/UIProcess/libwpe/WebPasteboardProxyLibWPE.cpp 2020-01-14 20:03:32 UTC (rev 254524)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
+ * 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 <WebCore/PlatformPasteboard.h>
+#include <wtf/CompletionHandler.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+using namespace WebCore;
+
+void WebPasteboardProxy::getPasteboardTypes(CompletionHandler<void(Vector<String>&&)>&& completionHandler)
+{
+ Vector<String> pasteboardTypes;
+ PlatformPasteboard().getTypes(pasteboardTypes);
+ completionHandler(WTFMove(pasteboardTypes));
+}
+
+void WebPasteboardProxy::readStringFromPasteboard(size_t index, const String& pasteboardType, const String&, CompletionHandler<void(String&&)>&& completionHandler)
+{
+ completionHandler(PlatformPasteboard().readString(index, pasteboardType));
+}
+
+void WebPasteboardProxy::writeWebContentToPasteboard(const WebCore::PasteboardWebContent& content)
+{
+ PlatformPasteboard().write(content);
+}
+
+void WebPasteboardProxy::writeStringToPasteboard(const String& pasteboardType, const String& text)
+{
+ PlatformPasteboard().write(pasteboardType, text);
+}
+
+} // namespace WebKit
Deleted: trunk/Source/WebKit/UIProcess/wpe/WebPasteboardProxyWPE.cpp (254523 => 254524)
--- trunk/Source/WebKit/UIProcess/wpe/WebPasteboardProxyWPE.cpp 2020-01-14 20:00:45 UTC (rev 254523)
+++ trunk/Source/WebKit/UIProcess/wpe/WebPasteboardProxyWPE.cpp 2020-01-14 20:03:32 UTC (rev 254524)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2015 Igalia S.L.
- *
- * 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 <WebCore/PlatformPasteboard.h>
-#include <wtf/CompletionHandler.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-using namespace WebCore;
-
-void WebPasteboardProxy::getPasteboardTypes(CompletionHandler<void(Vector<String>&&)>&& completionHandler)
-{
- Vector<String> pasteboardTypes;
- PlatformPasteboard().getTypes(pasteboardTypes);
- completionHandler(WTFMove(pasteboardTypes));
-}
-
-void WebPasteboardProxy::readStringFromPasteboard(size_t index, const String& pasteboardType, const String&, CompletionHandler<void(String&&)>&& completionHandler)
-{
- completionHandler(PlatformPasteboard().readString(index, pasteboardType));
-}
-
-void WebPasteboardProxy::writeWebContentToPasteboard(const WebCore::PasteboardWebContent& content)
-{
- PlatformPasteboard().write(content);
-}
-
-void WebPasteboardProxy::writeStringToPasteboard(const String& pasteboardType, const String& text)
-{
- PlatformPasteboard().write(pasteboardType, text);
-}
-
-} // namespace WebKit
