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

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2be111b9eb33a05ee2d40ba2902bebffc1e50eec
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 18:35:19 2010 +0000

    Unreviewed trivial build fix (linux, 64 bit, gcc-4.5.1)
    
    * WebProcess/WebCoreSupport/WebChromeClient.cpp:
    (WebKit::WebChromeClient::exceededDatabaseQuota):
    Don't use unsigned long long as alias for uint64_t.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 93475fa..2b48dbd 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-13  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Unreviewed trivial build fix (linux, 64 bit, gcc-4.5.1)
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::exceededDatabaseQuota):
+        Don't use unsigned long long as alias for uint64_t.
+
 2010-12-13  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index 011c8e5..c1925ba 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -426,8 +426,8 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
     SecurityOrigin* origin = frame->document()->securityOrigin();
 
     DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(databaseName, origin);
-    unsigned long long currentQuota = DatabaseTracker::tracker().quotaForOrigin(origin);
-    unsigned long long newQuota = 0;
+    uint64_t currentQuota = DatabaseTracker::tracker().quotaForOrigin(origin);
+    uint64_t newQuota = 0;
     WebProcess::shared().connection()->sendSync(
         Messages::WebPageProxy::ExceededDatabaseQuota(webFrame->frameID(), origin->databaseIdentifier(), databaseName, details.displayName(), currentQuota, details.currentUsage(), details.expectedUsage()),
         Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota), m_page->pageID());

-- 
WebKit Debian packaging