[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f581c553e5967c8ae7df1fc63340dd28f2d00746
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 01:53:21 2010 +0000

    Rolled back most of the FileReaderLoader changes to fix 32-bit builds.
    
    * fileapi/FileReaderLoader.cpp: Changed types back to unsigned from unsigned long long
    * fileapi/FileReaderLoader.h: Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72991 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 41c2f1c..0e0b926 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-30  Darin Adler  <darin at apple.com>
+
+        Rolled back most of the FileReaderLoader changes to fix 32-bit builds.
+
+        * fileapi/FileReaderLoader.cpp: Changed types back to unsigned from unsigned long long
+        * fileapi/FileReaderLoader.h: Ditto.
+
 2010-11-30  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/fileapi/FileReaderLoader.cpp b/WebCore/fileapi/FileReaderLoader.cpp
index d7e1097..24904e2 100644
--- a/WebCore/fileapi/FileReaderLoader.cpp
+++ b/WebCore/fileapi/FileReaderLoader.cpp
@@ -144,7 +144,7 @@ void FileReaderLoader::didReceiveResponse(const ResourceResponse& response)
         return;
     }
 
-    m_totalBytes = length;
+    m_totalBytes = static_cast<unsigned>(length);
 
     if (m_client)
         m_client->didStartLoading();
@@ -160,7 +160,7 @@ void FileReaderLoader::didReceiveData(const char* data, int lengthReceived)
         return;
 
     int length = lengthReceived;
-    unsigned long long remainingBufferSpace = m_totalBytes - m_bytesLoaded;
+    unsigned remainingBufferSpace = m_totalBytes - m_bytesLoaded;
     if (length > static_cast<long long>(remainingBufferSpace))
         length = static_cast<int>(remainingBufferSpace);
 
diff --git a/WebCore/fileapi/FileReaderLoader.h b/WebCore/fileapi/FileReaderLoader.h
index 7197a9f..a15ee01 100644
--- a/WebCore/fileapi/FileReaderLoader.h
+++ b/WebCore/fileapi/FileReaderLoader.h
@@ -73,8 +73,8 @@ public:
 
     String stringResult();
     PassRefPtr<ArrayBuffer> arrayBufferResult() const;
-    unsigned long long bytesLoaded() const { return m_bytesLoaded; }
-    unsigned long long totalBytes() const { return m_totalBytes; }
+    unsigned bytesLoaded() const { return m_bytesLoaded; }
+    unsigned totalBytes() const { return m_totalBytes; }
     int errorCode() const { return m_errorCode; }
 
     void setEncoding(const String&);
@@ -107,8 +107,8 @@ private:
     // The decoder used to decode the text data.
     RefPtr<TextResourceDecoder> m_decoder;
 
-    unsigned long long m_bytesLoaded;
-    unsigned long long m_totalBytes;
+    unsigned m_bytesLoaded;
+    unsigned m_totalBytes;
     int m_errorCode;
 };
 

-- 
WebKit Debian packaging