[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 68896bc2f3a69e0975fd5544b757be7cb611f03e
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 01:29:48 2011 +0000

    2011-01-02  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Csaba Osztrogonác.
    
            WebKit 2 does not build on 64bits with a recent GCC
            https://bugs.webkit.org/show_bug.cgi?id=51754
    
            Use explicitely 64 bits types for the attributes of DatabaseDetails.
    
            * storage/DatabaseDetails.h:
            (WebCore::DatabaseDetails::expectedUsage):
            (WebCore::DatabaseDetails::currentUsage):
    2011-01-02  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Csaba Osztrogonác.
    
            WebKit 2 does not build on 64bits with a recent GCC
            https://bugs.webkit.org/show_bug.cgi?id=51754
    
            Change the argument coding for DatabaseDetails to use explicitely the 64 bits type.
    
            * Shared/OriginAndDatabases.h:
            * Shared/WebCoreArgumentCoders.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 92dcea7..ec641b0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-02  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        WebKit 2 does not build on 64bits with a recent GCC
+        https://bugs.webkit.org/show_bug.cgi?id=51754
+
+        Use explicitely 64 bits types for the attributes of DatabaseDetails.
+
+        * storage/DatabaseDetails.h:
+        (WebCore::DatabaseDetails::expectedUsage):
+        (WebCore::DatabaseDetails::currentUsage):
+
 2011-01-02  Patrick Gansterer  <paroga at webkit.org>
 
         Unreviewed WinCE build fix for r74868.
diff --git a/WebCore/storage/DatabaseDetails.h b/WebCore/storage/DatabaseDetails.h
index ceebd35..c2217af 100644
--- a/WebCore/storage/DatabaseDetails.h
+++ b/WebCore/storage/DatabaseDetails.h
@@ -59,8 +59,8 @@ public:
 
     const String& name() const { return m_name; }
     const String& displayName() const { return m_displayName; }
-    unsigned long long expectedUsage() const { return m_expectedUsage; }
-    unsigned long long currentUsage() const { return m_currentUsage; }
+    uint64_t expectedUsage() const { return m_expectedUsage; }
+    uint64_t currentUsage() const { return m_currentUsage; }
 #ifndef NDEBUG
     ThreadIdentifier thread() const { return m_thread; }
 #endif
@@ -68,8 +68,8 @@ public:
 private:
     String m_name;
     String m_displayName;
-    unsigned long long m_expectedUsage;
-    unsigned long long m_currentUsage;
+    uint64_t m_expectedUsage;
+    uint64_t m_currentUsage;
 #ifndef NDEBUG
     ThreadIdentifier m_thread;
 #endif
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2b08160..8d8b993 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-02  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        WebKit 2 does not build on 64bits with a recent GCC
+        https://bugs.webkit.org/show_bug.cgi?id=51754
+
+        Change the argument coding for DatabaseDetails to use explicitely the 64 bits type.
+
+        * Shared/OriginAndDatabases.h:
+        * Shared/WebCoreArgumentCoders.h:
+
 2011-01-02  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKit2/Shared/OriginAndDatabases.h b/WebKit2/Shared/OriginAndDatabases.h
index c136e8f..03f7261 100644
--- a/WebKit2/Shared/OriginAndDatabases.h
+++ b/WebKit2/Shared/OriginAndDatabases.h
@@ -42,8 +42,8 @@ struct OriginAndDatabases {
     static bool decode(CoreIPC::ArgumentDecoder*, OriginAndDatabases&);
 
     String originIdentifier;
-    unsigned long long originQuota;
-    unsigned long long originUsage;
+    uint64_t originQuota;
+    uint64_t originUsage;
     Vector<WebCore::DatabaseDetails> databases;
 };
 
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index b7ead18..e6325ca 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -384,8 +384,8 @@ template<> struct ArgumentCoder<WebCore::DatabaseDetails> {
     {
         String name;
         String displayName;
-        unsigned long long expectedUsage;
-        unsigned long long currentUsage;
+        uint64_t expectedUsage;
+        uint64_t currentUsage;
         if (!decoder->decode(CoreIPC::Out(name, displayName, expectedUsage, currentUsage)))
             return false;
         

-- 
WebKit Debian packaging