[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dumi at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit c557d8636056504e5e87648aea746c086daf464f
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 20:42:44 2009 +0000

    Build fix, no review needed.
    
    Patch by Dumitru Daniliuc <dumi at chromium.org> on 2009-10-27
    Fixing the BUILD. m_estimatedSize in Database.h should be of type
    'unsigned long' instead of 'unsigned long long'.
    
    No tests required.
    
    * storage/Database.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9a0149e..9e18d5d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2009-10-27  Dumitru Daniliuc  <dumi at chromium.org>
 
+        Build fix, no review needed.
+
+        Fixing the BUILD. m_estimatedSize in Database.h should be of type
+        'unsigned long' instead of 'unsigned long long'.
+
+        No tests required.
+
+        * storage/Database.h:
+
+2009-10-27  Dumitru Daniliuc  <dumi at chromium.org>
+
         Reviewed by Adam Barth.
 
         Refactoring the Database class to not depend on
diff --git a/WebCore/storage/Database.h b/WebCore/storage/Database.h
index 098845c..f275027 100644
--- a/WebCore/storage/Database.h
+++ b/WebCore/storage/Database.h
@@ -146,7 +146,7 @@ private:
     int m_guid;
     String m_expectedVersion;
     String m_displayName;
-    unsigned long long m_estimatedSize;
+    unsigned long m_estimatedSize;
     String m_filename;
 
     bool m_deleted;

-- 
WebKit Debian packaging