[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 1043915ed15eb252f7efa008216c7207671f2082
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 06:49:54 2009 +0000

    32-bit build fix: restore previous cast that I thought was unnecessary.
    
    Patch by Geoffrey Garen <ggaren at apple.com> on 2009-09-23
    * xml/XMLHttpRequest.cpp:
    (WebCore::XMLHttpRequest::didSendData):
    (WebCore::XMLHttpRequest::didReceiveData):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3cdc68f..61aeb62 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2009-09-23  Geoffrey Garen  <ggaren at apple.com>
 
+        32-bit build fix: restore previous cast that I thought was unnecessary.
+
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::didSendData):
+        (WebCore::XMLHttpRequest::didReceiveData):
+
+2009-09-23  Geoffrey Garen  <ggaren at apple.com>
+
         Reviewed by Sam Weinig.
 
         Bring a little sanity to this crazy EventTarget world of ours
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index 45abf30..798ae00 100644
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -839,7 +839,7 @@ void XMLHttpRequest::didSendData(unsigned long long bytesSent, unsigned long lon
         return;
 
     if (m_uploadEventsAllowed)
-        m_upload->dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, true, bytesSent, totalBytesToBeSent));
+        m_upload->dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, true, static_cast<unsigned>(bytesSent), static_cast<unsigned>(totalBytesToBeSent)));
 
     if (bytesSent == totalBytesToBeSent && !m_uploadComplete) {
         m_uploadComplete = true;
@@ -897,7 +897,7 @@ void XMLHttpRequest::didReceiveData(const char* data, int len)
 
         // FIXME: the spec requires that we dispatch the event according to the least
         // frequent method between every 350ms (+/-200ms) and for every byte received.
-        dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, expectedLength && m_receivedLength <= expectedLength, m_receivedLength, expectedLength));
+        dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, expectedLength && m_receivedLength <= expectedLength, static_cast<unsigned>(m_receivedLength), static_cast<unsigned>(expectedLength)));
 
         if (m_state != LOADING)
             changeState(LOADING);

-- 
WebKit Debian packaging