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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9bdca076b037cfe9ea279de7ff7471ebe16a0efb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 05:31:25 2010 +0000

    2010-02-14  Diego Escalante Urrelo  <descalante at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [gtk] WebKitDownload's currentSize property is guint, should be guint64
            https://bugs.webkit.org/show_bug.cgi?id=34829
    
            Actually use a guint64 for current-size property in WebKitDownload, we
            were using a guint which is likely the cause for wrong sizes for files
            over 4 Gb.
    
            * webkit/webkitdownload.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 7a44884..8fdd05e 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-14  Diego Escalante Urrelo  <descalante at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [gtk] WebKitDownload's currentSize property is guint, should be guint64
+        https://bugs.webkit.org/show_bug.cgi?id=34829
+
+        Actually use a guint64 for current-size property in WebKitDownload, we
+        were using a guint which is likely the cause for wrong sizes for files
+        over 4 Gb.
+
+        * webkit/webkitdownload.cpp:
+
 2010-02-09  Gustavo Noronha Silva  <gns at gnome.org>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp
index 1912a12..82704df 100644
--- a/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/WebKit/gtk/webkit/webkitdownload.cpp
@@ -70,7 +70,7 @@ class DownloadClient : public Noncopyable, public ResourceHandleClient {
 struct _WebKitDownloadPrivate {
     gchar* destinationURI;
     gchar* suggestedFilename;
-    guint currentSize;
+    guint64 currentSize;
     GTimer* timer;
     WebKitDownloadStatus status;
     GFileOutputStream* outputStream;
@@ -755,7 +755,7 @@ guint64 webkit_download_get_total_size(WebKitDownload* download)
     if (!message)
         return 0;
 
-    return MAX(priv->currentSize, soup_message_headers_get_content_length(message->response_headers));
+    return MAX(priv->currentSize, static_cast<guint64>(soup_message_headers_get_content_length(message->response_headers)));
 }
 
 /**

-- 
WebKit Debian packaging