Changeset 286861 in webkit

Timestamp:

Dec 10, 2021, 11:02:55 AM (5 years ago)

Author:

Devin Rousso

Message:

Add a way to write a SharedBuffer to the Pasteboard
​https://bugs.webkit.org/show_bug.cgi?id=234065

Reviewed by Wenson Hsieh.

In order to match the WK1 implementation of -pasteFont: <​https://webkit.org/b/191379>, we
need to be able to write a SharedBuffer (with an associated type) to the font pasteboard.

Create a struct PasteboardBuffer to wrap the SharedBuffer and String type (and a
String contentOrigin on Cocoa platforms, which is used to decide whether to show a "Paste"
callout to the user as a gate on crossorigin content sharing) in a single object.

Though it isn't used in this patch, -pasteFont: <​https://webkit.org/b/191379> will use
this to write RTF data (which contains the necessary font data).

No change in behavior.

• platform/Pasteboard.h:
• platform/Pasteboard.cpp:
• platform/libwpe/PasteboardLibWPE.cpp:

(WebCore::Pasteboard::write):

• platform/gtk/PasteboardGtk.cpp:

(WebCore::Pasteboard::write):

• platform/ios/PasteboardIOS.mm:

(WebCore::Pasteboard::write):

• platform/mac/PasteboardMac.mm:

(WebCore::Pasteboard::write):

• platform/win/PasteboardWin.cpp:

(WebCore::Pasteboard::write):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Pasteboard.cpp (modified) (1 diff)
• platform/Pasteboard.h (modified) (2 diffs)
• platform/gtk/PasteboardGtk.cpp (modified) (1 diff)
• platform/ios/PasteboardIOS.mm (modified) (1 diff)
• platform/libwpe/PasteboardLibWPE.cpp (modified) (1 diff)
• platform/mac/PasteboardMac.mm (modified) (1 diff)
• platform/win/PasteboardWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-10  Devin Rousso  <drousso@apple.com>
+
+        Add a way to write a `SharedBuffer` to the Pasteboard
+        https://bugs.webkit.org/show_bug.cgi?id=234065
+
+        Reviewed by Wenson Hsieh.
+
+        In order to match the WK1 implementation of `-pasteFont:` <https://webkit.org/b/191379>, we
+        need to be able to write a `SharedBuffer` (with an associated type) to the font pasteboard.
+
+        Create a `struct PasteboardBuffer` to wrap the `SharedBuffer` and `String type` (and a
+        `String contentOrigin` on Cocoa platforms, which is used to decide whether to show a "Paste"
+        callout to the user as a gate on crossorigin content sharing) in a single object.
+
+        Though it isn't used in this patch, `-pasteFont:` <https://webkit.org/b/191379> will use
+        this to write RTF data (which contains the necessary font data).
+
+        No change in behavior.
+
+        * platform/Pasteboard.h:
+        * platform/Pasteboard.cpp:
+        * platform/libwpe/PasteboardLibWPE.cpp:
+        (WebCore::Pasteboard::write):
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::Pasteboard::write):
+        * platform/ios/PasteboardIOS.mm:
+        (WebCore::Pasteboard::write):
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::write):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::write):
+
 2021-12-10  Patrick Griffis  <pgriffis@igalia.com>
 

trunk/Source/WebCore/platform/Pasteboard.cpp

@@ -38 +38 @@
 PasteboardImage::PasteboardImage() = default;
 PasteboardImage::~PasteboardImage() = default;
+
+// Making this non-inline so that WebKit 2's decoding doesn't have to include SharedBuffer.h.
+PasteboardBuffer::PasteboardBuffer() = default;
+PasteboardBuffer::~PasteboardBuffer() = default;
 
 bool Pasteboard::isSafeTypeForDOMToReadAndWrite(const String& type)

trunk/Source/WebCore/platform/Pasteboard.h

@@ -136 +136 @@
 };
 
+struct PasteboardBuffer {
+    WEBCORE_EXPORT PasteboardBuffer();
+    WEBCORE_EXPORT ~PasteboardBuffer();
+
+#if PLATFORM(COCOA)
+    String contentOrigin;
+#endif
+    String type;
+    RefPtr<SharedBuffer> data;
+};
+
 // For reading from the pasteboard.
 
@@ -224 +235 @@
     virtual WEBCORE_EXPORT void writeTrustworthyWebURLsPboardType(const PasteboardURL&);
     virtual WEBCORE_EXPORT void write(const PasteboardImage&);
+    virtual WEBCORE_EXPORT void write(const PasteboardBuffer&);
     virtual WEBCORE_EXPORT void write(const PasteboardWebContent&);
 

trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp

@@ -184 +184 @@
 }
 
+void Pasteboard::write(const PasteboardBuffer&)
+{
+}
+
 void Pasteboard::write(const PasteboardWebContent& pasteboardContent)
 {

trunk/Source/WebCore/platform/ios/PasteboardIOS.mm

@@ -129 +129 @@
 }
 
+void Pasteboard::write(const PasteboardBuffer&)
+{
+}
+
 void Pasteboard::writePlainText(const String& text, SmartReplaceOption)
 {

trunk/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp

@@ -124 +124 @@
 }
 
+void Pasteboard::write(const PasteboardBuffer&)
+{
+}
+
 void Pasteboard::write(const PasteboardWebContent& content)
 {

trunk/Source/WebCore/platform/mac/PasteboardMac.mm

@@ -299 +299 @@
 }
 
+void Pasteboard::write(const PasteboardBuffer& pasteboardBuffer)
+{
+    ASSERT(!pasteboardBuffer.type.isEmpty());
+    ASSERT(pasteboardBuffer.data);
+
+    m_changeCount = platformStrategies()->pasteboardStrategy()->setTypes({ pasteboardBuffer.type, PasteboardCustomData::cocoaType() }, m_pasteboardName, context());
+
+    m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(pasteboardBuffer.data.get(), pasteboardBuffer.type, m_pasteboardName, context());
+
+    PasteboardCustomData pasteboardCustomData;
+    pasteboardCustomData.setOrigin(pasteboardBuffer.contentOrigin);
+    m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(pasteboardCustomData.createSharedBuffer().ptr(), PasteboardCustomData::cocoaType(), m_pasteboardName, context());
+}
+
 bool Pasteboard::canSmartReplace()
 {

trunk/Source/WebCore/platform/win/PasteboardWin.cpp

@@ -1119 +1119 @@
 }
 
+void Pasteboard::write(const PasteboardBuffer&)
+{
+}
+
 void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
 {