2010-02-07 Jian Li <jianli@chromium.org>

        Reviewed by Darin Fisher.

        [chromium] Change chromium interface to handle DownloadURL format.
        https://bugs.webkit.org/show_bug.cgi?id=34655

        * platform/chromium/ChromiumDataObject.cpp:
        (WebCore::ChromiumDataObject::clear):
        (WebCore::ChromiumDataObject::hasData):
        (WebCore::ChromiumDataObject::ChromiumDataObject):
        * platform/chromium/ChromiumDataObject.h:
        * platform/chromium/ClipboardChromium.cpp:
        (WebCore::ClipboardChromium::setData):
2010-02-07  Jian Li  <jianli@chromium.org>

        Reviewed by Darin Fisher.

        [chromium] Change chromium interface to handle DownloadURL format.
        https://bugs.webkit.org/show_bug.cgi?id=34655

        * public/WebDragData.h:
        * src/WebDragData.cpp:
        (WebKit::WebDragData::downloadMetadata):
        (WebKit::WebDragData::setDownloadMetadata):

git-svn-id: svn://svn.chromium.org/blink/trunk@54469 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2010-02-07  Jian Li  <jianli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Change chromium interface to handle DownloadURL format.
+        https://bugs.webkit.org/show_bug.cgi?id=34655
+
+        * platform/chromium/ChromiumDataObject.cpp:
+        (WebCore::ChromiumDataObject::clear):
+        (WebCore::ChromiumDataObject::hasData):
+        (WebCore::ChromiumDataObject::ChromiumDataObject):
+        * platform/chromium/ChromiumDataObject.h:
+        * platform/chromium/ClipboardChromium.cpp:
+        (WebCore::ClipboardChromium::setData):
+
 2010-02-06  Dimitri Glazkov  <dglazkov@chromium.org>
 
         No review, rolling out r54364.

third_party/WebKit/WebCore/platform/chromium/ChromiumDataObject.cpp

@@ -38,6 +38,7 @@ void ChromiumDataObject::clear()
     url = KURL();
     urlTitle = "";
     downloadURL = KURL();
+    downloadMetadata = "";
     fileExtension = "";
     filenames.clear();
     plainText = "";
@@ -52,6 +53,7 @@ bool ChromiumDataObject::hasData() const
 {
     return !url.isEmpty()
         || !downloadURL.isEmpty()
+        || !downloadMetadata.isEmpty()
         || !fileExtension.isEmpty()
         || !filenames.isEmpty()
         || !plainText.isEmpty()
@@ -63,6 +65,7 @@ ChromiumDataObject::ChromiumDataObject(const ChromiumDataObject& other)
     : url(other.url)
     , urlTitle(other.urlTitle)
     , downloadURL(other.downloadURL)
+    , downloadMetadata(other.downloadMetadata)
     , fileExtension(other.fileExtension)
     , filenames(other.filenames)
     , plainText(other.plainText)

third_party/WebKit/WebCore/platform/chromium/ChromiumDataObject.h

@@ -60,6 +60,7 @@ namespace WebCore {
         String urlTitle;
 
         KURL downloadURL;
+        String downloadMetadata;
 
         String fileExtension;
         Vector<String> filenames;

third_party/WebKit/WebCore/platform/chromium/ClipboardChromium.cpp

@@ -160,11 +160,11 @@ bool ClipboardChromium::setData(const String& type, const String& data)
     }
     
     if (winType == ClipboardDataTypeDownloadURL) {
+        m_dataObject->downloadMetadata = data;
         KURL url = KURL(ParsedURLString, data);
-        if (url.isValid()) {
+        if (url.isValid())
             m_dataObject->downloadURL = url;
-            return true;
-        }
+        return true;
     }
 
     return false;

third_party/WebKit/WebKit/chromium/ChangeLog

+2010-02-07  Jian Li  <jianli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Change chromium interface to handle DownloadURL format.
+        https://bugs.webkit.org/show_bug.cgi?id=34655
+
+        * public/WebDragData.h:
+        * src/WebDragData.cpp:
+        (WebKit::WebDragData::downloadMetadata):
+        (WebKit::WebDragData::setDownloadMetadata):
+
 2010-02-06  Dimitri Glazkov  <dglazkov@chromium.org>
 
         No review, rolling out r54364.

third_party/WebKit/WebKit/chromium/public/WebDragData.h

@@ -74,6 +74,8 @@ public:
 
     WEBKIT_API WebURL downloadURL() const;
     WEBKIT_API void setDownloadURL(const WebURL&);
+    WEBKIT_API WebString downloadMetadata() const;
+    WEBKIT_API void setDownloadMetadata(const WebString&);
 
     WEBKIT_API WebString fileExtension() const;
     WEBKIT_API void setFileExtension(const WebString&);

third_party/WebKit/WebKit/chromium/src/WebDragData.cpp

@@ -100,6 +100,18 @@ void WebDragData::setDownloadURL(const WebURL& downloadURL)
     m_private->downloadURL = downloadURL;
 }
 
+WebString WebDragData::downloadMetadata() const
+{
+    ASSERT(!isNull());
+    return m_private->downloadMetadata;
+}
+
+void WebDragData::setDownloadMetadata(const WebString& downloadMetadata)
+{
+    ensureMutable();
+    m_private->downloadMetadata = downloadMetadata;
+}
+
 WebString WebDragData::fileExtension() const
 {
     ASSERT(!isNull());