[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mjs at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit bad4406e6106c8278415c28ccc67ab7389baac7b
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 06:15:01 2011 +0000

    2011-01-24  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Implement database quota callback to fix storage tests on WebKit2 bot
            https://bugs.webkit.org/show_bug.cgi?id=53064
    
            * WebKitTestRunner/TestController.cpp:
            (WTR::exceededDatabaseQuota):
            (WTR::TestController::createOtherPage):
            (WTR::TestController::initialize):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76574 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e5c64db..533d908 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-24  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Dan Bernstein.
+
+        Implement database quota callback to fix storage tests on WebKit2 bot
+        https://bugs.webkit.org/show_bug.cgi?id=53064
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::exceededDatabaseQuota):
+        (WTR::TestController::createOtherPage):
+        (WTR::TestController::initialize):
+
+2011-01-24  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Anders Carlsson.
 
         Use designated temp directory for the database for WebKit2
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index 23a8732..5d65d43 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -29,8 +29,8 @@
 #include "StringFunctions.h"
 #include "TestInvocation.h"
 #include <cstdio>
-#include <WebKit2/WKPageGroup.h>
 #include <WebKit2/WKContextPrivate.h>
+#include <WebKit2/WKPageGroup.h>
 #include <WebKit2/WKPreferencesPrivate.h>
 #include <WebKit2/WKRetainPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -104,6 +104,13 @@ static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKF
     return true;
 }
 
+static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long, unsigned long long, unsigned long long, const void*)
+{
+    static const unsigned long long defaultQuota = 5 * 1024 * 1024;    
+    return defaultQuota;
+}
+
+
 void TestController::runModal(WKPageRef page, const void* clientInfo)
 {
     runModal(static_cast<PlatformWebView*>(const_cast<void*>(clientInfo)));
@@ -149,7 +156,7 @@ WKPageRef TestController::createOtherPage(WKPageRef oldPage, WKDictionaryRef, WK
         runBeforeUnloadConfirmPanel,
         0, // didDraw
         0, // pageDidScroll
-        0, // exceededDatabaseQuota
+        exceededDatabaseQuota,
         0, // runOpenPanel
         0, // decidePolicyForGeolocationPermissionRequest
         0, // headerHeight
@@ -281,7 +288,7 @@ void TestController::initialize(int argc, const char* argv[])
         runBeforeUnloadConfirmPanel,
         0, // didDraw
         0, // pageDidScroll
-        0, // exceededDatabaseQuota
+        exceededDatabaseQuota,
         0, // runOpenPanel
         0, // decidePolicyForGeolocationPermissionRequest
         0, // headerHeight

-- 
WebKit Debian packaging