Diff
Modified: trunk/Source/WebCore/ChangeLog (258895 => 258896)
--- trunk/Source/WebCore/ChangeLog 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebCore/ChangeLog 2020-03-24 01:56:56 UTC (rev 258896)
@@ -1,3 +1,22 @@
+2020-03-23 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove the unused method PasteboardStrategy::uniqueName()
+ https://bugs.webkit.org/show_bug.cgi?id=209452
+
+ Reviewed by Tim Horton.
+
+ This was introduced in <https://trac.webkit.org/r107844>, where it was used in the implementation of
+ Editor::newGeneralClipboard. However, this was subsequently removed in <https://trac.webkit.org/r150351>.
+
+ No change in behavior.
+
+ * platform/PasteboardStrategy.h:
+ * platform/PlatformPasteboard.h:
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::uniqueName): Deleted.
+ * platform/mac/PlatformPasteboardMac.mm:
+ (WebCore::PlatformPasteboard::uniqueName): Deleted.
+
2020-03-23 Alex Christensen <achristen...@webkit.org>
Add console message when legacy TLS is used
Modified: trunk/Source/WebCore/platform/PasteboardStrategy.h (258895 => 258896)
--- trunk/Source/WebCore/platform/PasteboardStrategy.h 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebCore/platform/PasteboardStrategy.h 2020-03-24 01:56:56 UTC (rev 258896)
@@ -55,7 +55,6 @@
virtual String stringForType(const String& pasteboardType, const String& pasteboardName) = 0;
virtual Vector<String> allStringsForType(const String& pasteboardType, const String& pasteboardName) = 0;
virtual int64_t changeCount(const String& pasteboardName) = 0;
- virtual String uniqueName() = 0;
virtual Color color(const String& pasteboardName) = 0;
virtual URL url(const String& pasteboardName) = 0;
virtual int getNumberOfFiles(const String& pasteboardName) = 0;
Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (258895 => 258896)
--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2020-03-24 01:56:56 UTC (rev 258896)
@@ -64,7 +64,6 @@
#endif
WEBCORE_EXPORT Optional<PasteboardItemInfo> informationForItemAtIndex(size_t index, int64_t changeCount);
WEBCORE_EXPORT Optional<Vector<PasteboardItemInfo>> allPasteboardItemInfo(int64_t changeCount);
- WEBCORE_EXPORT static String uniqueName();
enum class IncludeImageTypes : bool { No, Yes };
static String platformPasteboardTypeForSafeTypeForDOMToReadAndWrite(const String& domType, IncludeImageTypes = IncludeImageTypes::No);
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (258895 => 258896)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2020-03-24 01:56:56 UTC (rev 258896)
@@ -316,11 +316,6 @@
return [m_pasteboard changeCount];
}
-String PlatformPasteboard::uniqueName()
-{
- return String();
-}
-
String PlatformPasteboard::platformPasteboardTypeForSafeTypeForDOMToReadAndWrite(const String& domType, IncludeImageTypes includeImageTypes)
{
if (domType == "text/plain")
Modified: trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm (258895 => 258896)
--- trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebCore/platform/mac/PlatformPasteboardMac.mm 2020-03-24 01:56:56 UTC (rev 258896)
@@ -282,11 +282,6 @@
return { };
}
-String PlatformPasteboard::uniqueName()
-{
- return [[NSPasteboard pasteboardWithUniqueName] name];
-}
-
Color PlatformPasteboard::color()
{
return colorFromNSColor([NSColor colorFromPasteboard:m_pasteboard.get()]);
Modified: trunk/Source/WebKit/ChangeLog (258895 => 258896)
--- trunk/Source/WebKit/ChangeLog 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKit/ChangeLog 2020-03-24 01:56:56 UTC (rev 258896)
@@ -1,3 +1,20 @@
+2020-03-23 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove the unused method PasteboardStrategy::uniqueName()
+ https://bugs.webkit.org/show_bug.cgi?id=209452
+
+ Reviewed by Tim Horton.
+
+ See WebCore/ChangeLog for more detail.
+
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+ (WebKit::WebPasteboardProxy::getPasteboardUniqueName): Deleted.
+ * UIProcess/WebPasteboardProxy.h:
+ * UIProcess/WebPasteboardProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::uniqueName): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
2020-03-23 Commit Queue <commit-qu...@webkit.org>
Unreviewed, reverting r258891.
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (258895 => 258896)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2020-03-24 01:56:56 UTC (rev 258896)
@@ -121,11 +121,6 @@
completionHandler(PlatformPasteboard(pasteboardName).changeCount());
}
-void WebPasteboardProxy::getPasteboardUniqueName(CompletionHandler<void(String&&)>&& completionHandler)
-{
- completionHandler(PlatformPasteboard::uniqueName());
-}
-
void WebPasteboardProxy::getPasteboardColor(const String& pasteboardName, CompletionHandler<void(WebCore::Color&&)>&& completionHandler)
{
completionHandler(PlatformPasteboard(pasteboardName).color());
Modified: trunk/Source/WebKit/UIProcess/WebPasteboardProxy.h (258895 => 258896)
--- trunk/Source/WebKit/UIProcess/WebPasteboardProxy.h 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKit/UIProcess/WebPasteboardProxy.h 2020-03-24 01:56:56 UTC (rev 258896)
@@ -84,7 +84,6 @@
void getPasteboardStringsForType(const String& pasteboardName, const String& pasteboardType, CompletionHandler<void(Vector<String>&&)>&&);
void getPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, CompletionHandler<void(SharedMemory::Handle&&, uint64_t)>&&);
void getPasteboardChangeCount(const String& pasteboardName, CompletionHandler<void(int64_t)>&&);
- void getPasteboardUniqueName(CompletionHandler<void(String&&)>&&);
void getPasteboardColor(const String& pasteboardName, CompletionHandler<void(WebCore::Color&&)>&&);
void getPasteboardURL(const String& pasteboardName, CompletionHandler<void(const String&)>&&);
void addPasteboardTypes(const String& pasteboardName, const Vector<String>& pasteboardTypes, CompletionHandler<void(int64_t)>&&);
Modified: trunk/Source/WebKit/UIProcess/WebPasteboardProxy.messages.in (258895 => 258896)
--- trunk/Source/WebKit/UIProcess/WebPasteboardProxy.messages.in 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKit/UIProcess/WebPasteboardProxy.messages.in 2020-03-24 01:56:56 UTC (rev 258896)
@@ -47,7 +47,6 @@
GetPasteboardStringsForType(String pasteboardName, String pasteboardType) -> (Vector<String> strings) Synchronous
GetPasteboardBufferForType(String pasteboardName, String pasteboardType) -> (WebKit::SharedMemory::Handle handle, uint64_t size) Synchronous
GetPasteboardChangeCount(String pasteboardName) -> (int64_t changeCount) Synchronous
- GetPasteboardUniqueName() -> (String pasteboardName) Synchronous
GetPasteboardColor(String pasteboardName) -> (WebCore::Color color) Synchronous
GetPasteboardURL(String pasteboardName) -> (String urlString) Synchronous
AddPasteboardTypes(String pasteboardName, Vector<String> pasteboardTypes) -> (int64_t changeCount) Synchronous
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (258895 => 258896)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2020-03-24 01:56:56 UTC (rev 258896)
@@ -173,13 +173,6 @@
return changeCount;
}
-String WebPlatformStrategies::uniqueName()
-{
- String pasteboardName;
- WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardUniqueName(), Messages::WebPasteboardProxy::GetPasteboardUniqueName::Reply(pasteboardName), 0);
- return pasteboardName;
-}
-
Color WebPlatformStrategies::color(const String& pasteboardName)
{
Color color;
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h (258895 => 258896)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2020-03-24 01:56:56 UTC (rev 258896)
@@ -61,7 +61,6 @@
String stringForType(const String& pasteboardType, const String& pasteboardName) override;
Vector<String> allStringsForType(const String& pasteboardType, const String& pasteboardName) override;
int64_t changeCount(const String& pasteboardName) override;
- String uniqueName() override;
WebCore::Color color(const String& pasteboardName) override;
URL url(const String& pasteboardName) override;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (258895 => 258896)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-03-24 01:56:56 UTC (rev 258896)
@@ -1,3 +1,16 @@
+2020-03-23 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove the unused method PasteboardStrategy::uniqueName()
+ https://bugs.webkit.org/show_bug.cgi?id=209452
+
+ Reviewed by Tim Horton.
+
+ See WebCore/ChangeLog for more detail.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::uniqueName): Deleted.
+
2020-03-23 Darin Adler <da...@apple.com>
Change TextIterator::rangeLength to not require a live range
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.h (258895 => 258896)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.h 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.h 2020-03-24 01:56:56 UTC (rev 258896)
@@ -67,7 +67,6 @@
String stringForType(const String& pasteboardType, const String& pasteboardName) override;
Vector<String> allStringsForType(const String& pasteboardType, const String& pasteboardName) override;
int64_t changeCount(const String& pasteboardName) override;
- String uniqueName() override;
WebCore::Color color(const String& pasteboardName) override;
URL url(const String& pasteboardName) override;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm (258895 => 258896)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm 2020-03-24 01:40:53 UTC (rev 258895)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm 2020-03-24 01:56:56 UTC (rev 258896)
@@ -142,11 +142,6 @@
return PlatformPasteboard(pasteboardName).changeCount();
}
-String WebPlatformStrategies::uniqueName()
-{
- return PlatformPasteboard::uniqueName();
-}
-
Color WebPlatformStrategies::color(const String& pasteboardName)
{
return PlatformPasteboard(pasteboardName).color();
