[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 a75183446734beee7e5e8ceb68b72c2eb3816ffd
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 00:20:02 2010 +0000

    Cleaning up quota-tracking.html. Removing trailing whitespaces and
    fixing the errorFunction() to work correctly with both
    transaction() and executeSql().
    
    Reviewed by Dimitri Glazkov.
    
    https://bugs.webkit.org/show_bug.cgi?id=33628
    
    * storage/quota-tracking.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53214 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 514e80b..afed379 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-13  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Cleaning up quota-tracking.html. Removing trailing whitespaces and
+        fixing the errorFunction() to work correctly with both
+        transaction() and executeSql().
+
+        https://bugs.webkit.org/show_bug.cgi?id=33628
+
+        * storage/quota-tracking.html:
+
 2010-01-13  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Beth Dakin.
diff --git a/LayoutTests/storage/quota-tracking.html b/LayoutTests/storage/quota-tracking.html
index 6edc641..7b47e7b 100644
--- a/LayoutTests/storage/quota-tracking.html
+++ b/LayoutTests/storage/quota-tracking.html
@@ -16,7 +16,7 @@ function finishTest()
         layoutTestController.notifyDone();
 }
 
-function errorFunction(tx, error)
+function errorFunction(error)
 {
     log("Test failed - " + error.message);
     finishTest();
@@ -35,11 +35,13 @@ function checkCompletion(db)
 
 function addData(db)
 {
-    db.transaction(function(tx) { 
+    db.transaction(function(tx) {
         log("Inserting some data");
-        tx.executeSql("INSERT INTO DataTest (randomData) VALUES (ZEROBLOB(17408))", [], function(tx, result) { }, errorFunction); 
-    }, errorFunction, function() { 
-        checkCompletion(db); 
+        tx.executeSql("INSERT INTO DataTest (randomData) VALUES (ZEROBLOB(17408))", [],
+                      function(tx, result) { },
+                      function(tx, error) { errorFunction(error); });
+    }, errorFunction, function() {
+        checkCompletion(db);
     });
 }
 
@@ -47,9 +49,11 @@ function testDatabase(db)
 {
     db.transaction(function(tx) {
         log("Adding a table");
-        tx.executeSql("CREATE TABLE DataTest (randomData)", [], function(tx, result) { }, errorFunction); 
-    }, errorFunction, function() { 
-        addData(db); 
+        tx.executeSql("CREATE TABLE DataTest (randomData)", [],
+                      function(tx, result) { },
+                      function(tx, error) { errorFunction(error); });
+    }, errorFunction, function() {
+        addData(db);
     });
 }
 
@@ -62,12 +66,12 @@ function runTest()
         layoutTestController.dumpAsText();
         layoutTestController.waitUntilDone();
     }
-    
+
     database1 = openDatabase("QuotaManagementDatabase1", "1.0", "Test for quota management <rdar://5628468>", 1);
     database2 = openDatabase("QuotaManagementDatabase2", "1.0", "Test for quota management <rdar://5628468>", 1);
     database1.complete = false;
     database2.complete = false;
-    
+
     testDatabase(database1);
 }
 

-- 
WebKit Debian packaging