[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d3b8958b5d64dbdd6dec94814dd1d3db7da05b69
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Feb 7 12:35:36 2010 +0000

    2010-02-07  Jian Li  <jianli at 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 at 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: http://svn.webkit.org/repository/webkit/trunk@54469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b8c9b32..334bc77 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-07  Jian Li  <jianli at 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 at chromium.org>
 
         No review, rolling out r54364.
diff --git a/WebCore/platform/chromium/ChromiumDataObject.cpp b/WebCore/platform/chromium/ChromiumDataObject.cpp
index df0849c..695da9f 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.cpp
+++ b/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)
diff --git a/WebCore/platform/chromium/ChromiumDataObject.h b/WebCore/platform/chromium/ChromiumDataObject.h
index 15eb911..186a1a0 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.h
+++ b/WebCore/platform/chromium/ChromiumDataObject.h
@@ -60,6 +60,7 @@ namespace WebCore {
         String urlTitle;
 
         KURL downloadURL;
+        String downloadMetadata;
 
         String fileExtension;
         Vector<String> filenames;
diff --git a/WebCore/platform/chromium/ClipboardChromium.cpp b/WebCore/platform/chromium/ClipboardChromium.cpp
index 89fd61d..becf169 100644
--- a/WebCore/platform/chromium/ClipboardChromium.cpp
+++ b/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;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b022b17..e3e5a07 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-07  Jian Li  <jianli at 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 at chromium.org>
 
         No review, rolling out r54364.
diff --git a/WebKit/chromium/public/WebDragData.h b/WebKit/chromium/public/WebDragData.h
index 01582a9..0b861c8 100644
--- a/WebKit/chromium/public/WebDragData.h
+++ b/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&);
diff --git a/WebKit/chromium/src/WebDragData.cpp b/WebKit/chromium/src/WebDragData.cpp
index 3bd4a02..b18ab1b 100644
--- a/WebKit/chromium/src/WebDragData.cpp
+++ b/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());

-- 
WebKit Debian packaging