From 5ddde30071f639962dd557c453f2ad01f8f0fd00 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 8 Sep 2010 12:18:00 +0100 Subject: Merge WebKit at r66666 : Initial merge by git. Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f --- WebKit/chromium/src/ChromiumBridge.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'WebKit/chromium/src/ChromiumBridge.cpp') diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp index 33f405d..911dcf3 100644 --- a/WebKit/chromium/src/ChromiumBridge.cpp +++ b/WebKit/chromium/src/ChromiumBridge.cpp @@ -200,11 +200,11 @@ void ChromiumBridge::clipboardWriteImage(NativeImagePtr image, webKitClient()->clipboard()->writeImage(webImage, sourceURL, title); } -void ChromiumBridge::clipboardWriteData(ClipboardData* data) +void ChromiumBridge::clipboardWriteData(const String& type, + const String& data, + const String& metadata) { - notImplemented(); - WebDragData dragData; // FIXME: Define the conversion from ClipboardData to WebDragData. - webKitClient()->clipboard()->writeData(dragData); + webKitClient()->clipboard()->writeData(type, data, metadata); } HashSet ChromiumBridge::clipboardReadAvailableTypes( -- cgit v1.1