[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a6fe5f634c2c75ca60952902ca7b18929d025591
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 02:25:11 2010 +0000

    2010-08-27  Daniel Cheng  <dcheng at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] Add new WebClipboard method for setting generic data in copy/cut handlers.
            https://bugs.webkit.org/show_bug.cgi?id=42121
    
            No new tests.
    
            * platform/chromium/ChromiumBridge.h:
    2010-08-27  Daniel Cheng  <dcheng at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] Add new WebClipboard method for setting generic data in copy/cut handlers.
            https://bugs.webkit.org/show_bug.cgi?id=42121
    
            * public/WebClipboard.h:
            (WebKit::WebClipboard::writeData):
            (WebKit::WebClipboard::readFilenames):
            * src/ChromiumBridge.cpp:
            (WebCore::ChromiumBridge::clipboardWriteData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e16b872..372c00c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-27  Daniel Cheng  <dcheng at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Add new WebClipboard method for setting generic data in copy/cut handlers.
+        https://bugs.webkit.org/show_bug.cgi?id=42121
+
+        No new tests.
+
+        * platform/chromium/ChromiumBridge.h:
+
 2010-08-27  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h
index 35ace89..bc86de2 100644
--- a/WebCore/platform/chromium/ChromiumBridge.h
+++ b/WebCore/platform/chromium/ChromiumBridge.h
@@ -102,7 +102,7 @@ namespace WebCore {
         static void clipboardWritePlainText(const String&);
         static void clipboardWriteURL(const KURL&, const String&);
         static void clipboardWriteImage(NativeImagePtr, const KURL&, const String&);
-        static void clipboardWriteData(ClipboardData*);
+        static void clipboardWriteData(const String& type, const String& data, const String& metadata);
 
         // Interface for handling copy and paste, drag and drop, and selection copy.
         static HashSet<String> clipboardReadAvailableTypes(PasteboardPrivate::ClipboardBuffer, bool* containsFilenames);
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a64e1a9..95a4f6f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-27  Daniel Cheng  <dcheng at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Add new WebClipboard method for setting generic data in copy/cut handlers.
+        https://bugs.webkit.org/show_bug.cgi?id=42121
+
+        * public/WebClipboard.h:
+        (WebKit::WebClipboard::writeData):
+        (WebKit::WebClipboard::readFilenames):
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::clipboardWriteData):
+
 2010-08-27  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Dumitru Daniliuc.
diff --git a/WebKit/chromium/public/WebClipboard.h b/WebKit/chromium/public/WebClipboard.h
index 6755d96..861c522 100644
--- a/WebKit/chromium/public/WebClipboard.h
+++ b/WebKit/chromium/public/WebClipboard.h
@@ -71,7 +71,10 @@ public:
         const WebURL&, const WebString& title) { }
     virtual void writeImage(
         const WebImage&, const WebURL&, const WebString& title) { }
-    virtual void writeData(const WebDragData&) { }
+    virtual void writeData(
+        const WebString& type,
+        const WebString& data,
+        const WebString& metadata) { }
 
     // The following functions are used for reading platform data for copy and
     // paste, drag and drop, and selection copy (on X).
@@ -81,7 +84,8 @@ public:
     virtual bool readData(
         Buffer, const WebString& type, WebString* data,
         WebString* metadata) { return false; }
-    virtual WebVector<WebString> readFilenames(Buffer) { return WebVector<WebString>(); }
+    virtual WebVector<WebString> readFilenames(
+        Buffer) { return WebVector<WebString>(); }
 
 protected:
     ~WebClipboard() {}
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<String> ChromiumBridge::clipboardReadAvailableTypes(

-- 
WebKit Debian packaging