Title: [261608] trunk/Source
- Revision
- 261608
- Author
- [email protected]
- Date
- 2020-05-13 02:38:52 -0700 (Wed, 13 May 2020)
Log Message
Unreviewed. Fix GTK debug build after r261554
Source/WebCore:
Remove writeToClipboard that receives a const SelectionData& that is no longer used. Make
readBufferFromClipboard pure virtual and remove the GTK leftovers from PlatformPasteboard.
* platform/PasteboardStrategy.h:
* platform/PlatformPasteboard.h:
Source/WebKit:
Remove writeToClipboard that receives a const SelectionData& that is no longer used.
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (261607 => 261608)
--- trunk/Source/WebCore/ChangeLog 2020-05-13 08:57:55 UTC (rev 261607)
+++ trunk/Source/WebCore/ChangeLog 2020-05-13 09:38:52 UTC (rev 261608)
@@ -1,3 +1,13 @@
+2020-05-13 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK debug build after r261554
+
+ Remove writeToClipboard that receives a const SelectionData& that is no longer used. Make
+ readBufferFromClipboard pure virtual and remove the GTK leftovers from PlatformPasteboard.
+
+ * platform/PasteboardStrategy.h:
+ * platform/PlatformPasteboard.h:
+
2020-05-13 Antti Koivisto <[email protected]>
[Wheel event region] Add support for getting wheel event region from ScrollingTree
Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (261607 => 261608)
--- trunk/Source/WebCore/platform/PasteboardStrategy.h 2020-05-13 08:57:55 UTC (rev 261607)
+++ trunk/Source/WebCore/platform/PasteboardStrategy.h 2020-05-13 09:38:52 UTC (rev 261608)
@@ -84,9 +84,8 @@
virtual Vector<String> types(const String& pasteboardName) = 0;
virtual String readTextFromClipboard(const String& pasteboardName) = 0;
virtual Vector<String> readFilePathsFromClipboard(const String& pasteboardName) = 0;
- virtual RefPtr<SharedBuffer> readBufferFromClipboard(const String& pasteboardName, const String& pasteboardType);
+ virtual RefPtr<SharedBuffer> readBufferFromClipboard(const String& pasteboardName, const String& pasteboardType) = 0;
virtual void writeToClipboard(const String& pasteboardName, SelectionData&&) = 0;
- virtual void writeToClipboard(const String& pasteboardName, const SelectionData&) = 0;
virtual void clearClipboard(const String& pasteboardName) = 0;
#endif // PLATFORM(GTK)
Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (261607 => 261608)
--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2020-05-13 08:57:55 UTC (rev 261607)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2020-05-13 09:38:52 UTC (rev 261608)
@@ -101,11 +101,6 @@
WEBCORE_EXPORT Vector<String> typesSafeForDOMToReadAndWrite(const String& origin) const;
WEBCORE_EXPORT bool containsStringSafeForDOMToReadForType(const String&) const;
-#if PLATFORM(GTK)
- WEBCORE_EXPORT void writeToClipboard(const SelectionData&, WTF::Function<void()>&& primarySelectionCleared);
- WEBCORE_EXPORT Ref<SelectionData> readFromClipboard();
-#endif
-
#if PLATFORM(COCOA)
WEBCORE_EXPORT bool containsURLStringSuitableForLoading();
WEBCORE_EXPORT String urlStringSuitableForLoading(String& title);
@@ -126,9 +121,6 @@
#if PLATFORM(IOS_FAMILY)
RetainPtr<id> m_pasteboard;
#endif
-#if PLATFORM(GTK) && !USE(GTK4)
- GtkClipboard* m_clipboard;
-#endif
#if USE(LIBWPE)
struct wpe_pasteboard* m_pasteboard;
#endif
Modified: trunk/Source/WebKit/ChangeLog (261607 => 261608)
--- trunk/Source/WebKit/ChangeLog 2020-05-13 08:57:55 UTC (rev 261607)
+++ trunk/Source/WebKit/ChangeLog 2020-05-13 09:38:52 UTC (rev 261608)
@@ -1,3 +1,12 @@
+2020-05-13 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK debug build after r261554
+
+ Remove writeToClipboard that receives a const SelectionData& that is no longer used.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
2020-05-12 Peng Liu <[email protected]>
Add the feature flag plist file parser
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (261607 => 261608)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2020-05-13 08:57:55 UTC (rev 261607)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2020-05-13 09:38:52 UTC (rev 261608)
@@ -327,12 +327,6 @@
WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteToClipboard(pasteboardName, WebSelectionData(selectionData)), 0);
}
-void WebPlatformStrategies::writeToClipboard(const String& pasteboardName, const SelectionData& selection)
-{
- WebSelectionData selectionData(selection);
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::WriteToClipboard(pasteboardName, selectionData), 0);
-}
-
void WebPlatformStrategies::clearClipboard(const String& pasteboardName)
{
WebProcess::singleton().parentProcessConnection()->send(Messages::WebPasteboardProxy::ClearClipboard(pasteboardName), 0);
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h (261607 => 261608)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2020-05-13 08:57:55 UTC (rev 261607)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2020-05-13 09:38:52 UTC (rev 261608)
@@ -79,7 +79,6 @@
String readTextFromClipboard(const String& pasteboardName) override;
Vector<String> readFilePathsFromClipboard(const String& pasteboardName) override;
RefPtr<SharedBuffer> readBufferFromClipboard(const String& pasteboardName, const String& pasteboardType) override;
- void writeToClipboard(const String& pasteboardName, const WebCore::SelectionData&) override;
void writeToClipboard(const String& pasteboardName, WebCore::SelectionData&&) override;
void clearClipboard(const String& pasteboardName) override;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
