Diff
Modified: trunk/Source/WebCore/ChangeLog (99924 => 99925)
--- trunk/Source/WebCore/ChangeLog 2011-11-11 04:12:14 UTC (rev 99924)
+++ trunk/Source/WebCore/ChangeLog 2011-11-11 04:13:25 UTC (rev 99925)
@@ -1,5 +1,18 @@
2011-11-10 Daniel Cheng <[email protected]>
+ [chromium] Add plumbing for JS to write to clipboard in copy/cut events.
+ https://bugs.webkit.org/show_bug.cgi?id=71414
+
+ Reviewed by Darin Fisher.
+
+ No new tests since no new functionality enabled yet.
+
+ * platform/chromium/PasteboardChromium.cpp:
+ (WebCore::Pasteboard::writeClipboard):
+ * platform/chromium/PlatformSupport.h:
+
+2011-11-10 Daniel Cheng <[email protected]>
+
Atomically update the system clipboard for copy/cut events
https://bugs.webkit.org/show_bug.cgi?id=40515
Modified: trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp (99924 => 99925)
--- trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp 2011-11-11 04:12:14 UTC (rev 99924)
+++ trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp 2011-11-11 04:13:25 UTC (rev 99925)
@@ -155,8 +155,9 @@
PlatformSupport::clipboardWriteImage(bitmap, url, title);
}
-void Pasteboard::writeClipboard(Clipboard*)
+void Pasteboard::writeClipboard(Clipboard* clipboard)
{
+ PlatformSupport::clipboardWriteDataObject(clipboard);
}
bool Pasteboard::canSmartReplace()
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (99924 => 99925)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2011-11-11 04:12:14 UTC (rev 99924)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2011-11-11 04:13:25 UTC (rev 99925)
@@ -66,7 +66,7 @@
namespace WebCore {
-class ClipboardData;
+class Clipboard;
class Color;
class Cursor;
class Document;
@@ -111,6 +111,7 @@
static void clipboardWritePlainText(const String&);
static void clipboardWriteURL(const KURL&, const String&);
static void clipboardWriteImage(NativeImagePtr, const KURL&, const String&);
+ static void clipboardWriteDataObject(Clipboard*);
// Cookies ------------------------------------------------------------
static void setCookies(const Document*, const KURL&, const String& value);
Modified: trunk/Source/WebKit/chromium/ChangeLog (99924 => 99925)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-11 04:12:14 UTC (rev 99924)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-11 04:13:25 UTC (rev 99925)
@@ -1,3 +1,15 @@
+2011-11-10 Daniel Cheng <[email protected]>
+
+ [chromium] Add plumbing for JS to write to clipboard in copy/cut events.
+ https://bugs.webkit.org/show_bug.cgi?id=71414
+
+ Reviewed by Darin Fisher.
+
+ * public/WebClipboard.h:
+ (WebKit::WebClipboard::writeDataObject):
+ * src/PlatformSupport.cpp:
+ (WebCore::PlatformSupport::clipboardWriteDataObject):
+
2011-11-10 Vsevolod Vlasov <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebClipboard.h (99924 => 99925)
--- trunk/Source/WebKit/chromium/public/WebClipboard.h 2011-11-11 04:12:14 UTC (rev 99924)
+++ trunk/Source/WebKit/chromium/public/WebClipboard.h 2011-11-11 04:13:25 UTC (rev 99925)
@@ -87,6 +87,7 @@
const WebURL&, const WebString& title) { }
virtual void writeImage(
const WebImage&, const WebURL&, const WebString& title) { }
+ virtual void writeDataObject(const WebDragData&) { }
protected:
~WebClipboard() {}
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (99924 => 99925)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-11-11 04:12:14 UTC (rev 99924)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-11-11 04:13:25 UTC (rev 99925)
@@ -86,6 +86,7 @@
#endif
#include "BitmapImage.h"
+#include "ClipboardChromium.h"
#include "Cookie.h"
#include "Document.h"
#include "FrameView.h"
@@ -229,6 +230,12 @@
webKitPlatformSupport()->clipboard()->writeImage(webImage, sourceURL, title);
}
+void PlatformSupport::clipboardWriteDataObject(Clipboard* clipboard)
+{
+ WebDragData data = ""
+ webKitPlatformSupport()->clipboard()->writeDataObject(data);
+}
+
// Cookies --------------------------------------------------------------------
void PlatformSupport::setCookies(const Document* document, const KURL& url,
