[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jianli at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 05908ee53982936ddd23851ada829687fb84dcaf
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 19:08:09 2010 +0000

    [chromium] Remove the obsolete chromium interface for handling DownloadURL.
    https://bugs.webkit.org/show_bug.cgi?id=34982
    
    Reviewed by Darin Fisher.
    
    WebCore:
    
    * platform/chromium/ChromiumDataObject.cpp:
    (WebCore::ChromiumDataObject::clear):
    (WebCore::ChromiumDataObject::hasData):
    (WebCore::ChromiumDataObject::ChromiumDataObject):
    * platform/chromium/ChromiumDataObject.h:
    * platform/chromium/ClipboardChromium.cpp:
    (WebCore::ClipboardChromium::setData):
    
    WebKit/chromium:
    
    * public/WebDragData.h:
    * src/WebDragData.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0272801..d0602ca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-17  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Remove the obsolete chromium interface for handling DownloadURL.
+        https://bugs.webkit.org/show_bug.cgi?id=34982
+
+        * 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-17  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/chromium/ChromiumDataObject.cpp b/WebCore/platform/chromium/ChromiumDataObject.cpp
index 695da9f..77a5f0f 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.cpp
+++ b/WebCore/platform/chromium/ChromiumDataObject.cpp
@@ -37,7 +37,6 @@ void ChromiumDataObject::clear()
 {
     url = KURL();
     urlTitle = "";
-    downloadURL = KURL();
     downloadMetadata = "";
     fileExtension = "";
     filenames.clear();
@@ -52,7 +51,6 @@ void ChromiumDataObject::clear()
 bool ChromiumDataObject::hasData() const
 {
     return !url.isEmpty()
-        || !downloadURL.isEmpty()
         || !downloadMetadata.isEmpty()
         || !fileExtension.isEmpty()
         || !filenames.isEmpty()
@@ -64,7 +62,6 @@ bool ChromiumDataObject::hasData() const
 ChromiumDataObject::ChromiumDataObject(const ChromiumDataObject& other)
     : url(other.url)
     , urlTitle(other.urlTitle)
-    , downloadURL(other.downloadURL)
     , downloadMetadata(other.downloadMetadata)
     , fileExtension(other.fileExtension)
     , filenames(other.filenames)
diff --git a/WebCore/platform/chromium/ChromiumDataObject.h b/WebCore/platform/chromium/ChromiumDataObject.h
index 186a1a0..5fae3e3 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.h
+++ b/WebCore/platform/chromium/ChromiumDataObject.h
@@ -59,7 +59,6 @@ namespace WebCore {
         KURL url;
         String urlTitle;
 
-        KURL downloadURL;
         String downloadMetadata;
 
         String fileExtension;
diff --git a/WebCore/platform/chromium/ClipboardChromium.cpp b/WebCore/platform/chromium/ClipboardChromium.cpp
index 933d839..a1f60a6 100644
--- a/WebCore/platform/chromium/ClipboardChromium.cpp
+++ b/WebCore/platform/chromium/ClipboardChromium.cpp
@@ -161,9 +161,6 @@ bool ClipboardChromium::setData(const String& type, const String& data)
     
     if (winType == ClipboardDataTypeDownloadURL) {
         m_dataObject->downloadMetadata = data;
-        KURL url = KURL(ParsedURLString, data);
-        if (url.isValid())
-            m_dataObject->downloadURL = url;
         return true;
     }
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0d36913..7307996 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-17  Jian Li  <jianli at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Remove the obsolete chromium interface for handling DownloadURL.
+        https://bugs.webkit.org/show_bug.cgi?id=34982
+
+        * public/WebDragData.h:
+        * src/WebDragData.cpp:
+
 2010-02-16  James Hawkins  <jhawkins at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/public/WebDragData.h b/WebKit/chromium/public/WebDragData.h
index 0b861c8..2979519 100644
--- a/WebKit/chromium/public/WebDragData.h
+++ b/WebKit/chromium/public/WebDragData.h
@@ -72,8 +72,6 @@ public:
     WEBKIT_API WebString urlTitle() const;
     WEBKIT_API void setURLTitle(const WebString&);
 
-    WEBKIT_API WebURL downloadURL() const;
-    WEBKIT_API void setDownloadURL(const WebURL&);
     WEBKIT_API WebString downloadMetadata() const;
     WEBKIT_API void setDownloadMetadata(const WebString&);
 
diff --git a/WebKit/chromium/src/WebDragData.cpp b/WebKit/chromium/src/WebDragData.cpp
index b18ab1b..2f476a7 100644
--- a/WebKit/chromium/src/WebDragData.cpp
+++ b/WebKit/chromium/src/WebDragData.cpp
@@ -88,18 +88,6 @@ void WebDragData::setURLTitle(const WebString& urlTitle)
     m_private->urlTitle = urlTitle;
 }
 
-WebURL WebDragData::downloadURL() const
-{
-    ASSERT(!isNull());
-    return m_private->downloadURL;
-}
-
-void WebDragData::setDownloadURL(const WebURL& downloadURL)
-{
-    ensureMutable();
-    m_private->downloadURL = downloadURL;
-}
-
 WebString WebDragData::downloadMetadata() const
 {
     ASSERT(!isNull());

-- 
WebKit Debian packaging