[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

Fri Feb 26 22:21:48 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit ee1709af2a14f0f1a0f5c884ef74d4b99f7ff86d
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 01:51:18 2010 +0000

    Change quota-tracking.html to open databases only as they're
    needed. Otherwise, open databases end up using more space from
    this origin than the test expects.
    
    Reviewed by Simon Fraser.
    
    * storage/quota-tracking.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54853 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2b0dcb5..275d856 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-16  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Change quota-tracking.html to open databases only as they're
+        needed. Otherwise, open databases end up using more space from
+        this origin than the test expects.
+
+        * storage/quota-tracking.html:
+
 2010-02-16  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Rubber-stamped by Simon Fraser.
diff --git a/LayoutTests/storage/quota-tracking.html b/LayoutTests/storage/quota-tracking.html
index fb2cc9e..2b5b49d 100644
--- a/LayoutTests/storage/quota-tracking.html
+++ b/LayoutTests/storage/quota-tracking.html
@@ -1,9 +1,9 @@
 <html>
 <head>
 <script>
-var database1;
-var database2;
-var database3;
+var database1 = null;
+var database2 = null;
+var database3 = null;
 
 function log(message)
 {
@@ -39,13 +39,15 @@ function checkCompletion(db)
 {
     log("Done adding data");
 
-    db.complete = true;
-    if (database1.complete && database2.complete && database3.complete)
+    if (database3) {
         finishTest();
-    else if (database2.complete)
+    } else if (database2) {
+        database3 = openDatabase("QuotaManagementDatabase3", "1.0", "Test for quota management <rdar://5628468>", 1);
         testDatabase(database3);
-    else
+    } else {
+        database2 = openDatabase("QuotaManagementDatabase2", "1.0", "Test for quota management <rdar://5628468>", 1);
         testDatabase(database2);
+    }
 }
 
 function addData(db)
@@ -95,12 +97,6 @@ function runTest()
     }
 
     database1 = openDatabase("QuotaManagementDatabase1", "1.0", "Test for quota management <rdar://5628468>", 1);
-    database2 = openDatabase("QuotaManagementDatabase2", "1.0", "Test for quota management <rdar://5628468>", 1);
-    database3 = openDatabase("QuotaManagementDatabase3", "1.0", "Test for quota management <rdar://5628468>", 1);
-    database1.complete = false;
-    database2.complete = false;
-    database3.complete = false;
-
     testDatabase(database1);
 }
 

-- 
WebKit Debian packaging

