Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

6 files changed, 12 insertions, 12 deletions

diff --git a/LayoutTests/storage/domstorage/events/documentURI-expected.txt b/LayoutTests/storage/domstorage/events/documentURI-expected.txt
index 5952523..d53d4dc 100644
--- a/LayoutTests/storage/domstorage/events/documentURI-expected.txt
+++ b/LayoutTests/storage/domstorage/events/documentURI-expected.txt
@@ -1,4 +1,4 @@
-Test that changing documentURI has no effects on the uri passed into storage events.
+Test that changing documentURI has no effects on the url passed into storage events.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
@@ -10,7 +10,7 @@ Reset storage event list
 storageEventList = new Array()
 storage.foo = '123'
 PASS storageEventList.length is 1
-Saving URI
+Saving url
 document.documentURI = 'abc'
 PASS document.documentURI is "abc"
 storage.foo = 'xyz'
@@ -25,7 +25,7 @@ Reset storage event list
 storageEventList = new Array()
 storage.foo = '123'
 PASS storageEventList.length is 1
-Saving URI
+Saving url
 document.documentURI = 'abc'
 PASS document.documentURI is "abc"
 storage.foo = 'xyz'
diff --git a/LayoutTests/storage/domstorage/events/script-tests/documentURI.js b/LayoutTests/storage/domstorage/events/script-tests/documentURI.js
index 4b4f4cb..8df6fe9 100644
--- a/LayoutTests/storage/domstorage/events/script-tests/documentURI.js
+++ b/LayoutTests/storage/domstorage/events/script-tests/documentURI.js
@@ -1,4 +1,4 @@
-description("Test that changing documentURI has no effects on the uri passed into storage events.");
+description("Test that changing documentURI has no effects on the url passed into storage events.");
 
 function test(storageString, callback)
 {
@@ -29,8 +29,8 @@ function step1()
 function step2()
 {
     shouldBe("storageEventList.length", "1");
-    debug("Saving URI");
-    window.lastURI = storageEventList[0].uri;
+    debug("Saving url");
+    window.lastURL = storageEventList[0].url;
 
     evalAndLog("document.documentURI = 'abc'");
     shouldBeEqualToString("document.documentURI", "abc");
@@ -42,7 +42,7 @@ function step2()
 function step3()
 {
     shouldBe("storageEventList.length", "2");
-    shouldBeTrue(String(window.lastURI == storageEventList[1].uri));
+    shouldBeTrue(String(window.lastURL == storageEventList[1].url));
 
     completionCallback();
 }
diff --git a/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html b/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
index 2ab8ba1..bed860f 100644
--- a/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
+++ b/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
@@ -7,7 +7,7 @@ function handleStorageEvent(e)
     parent.log("Key           - " + e.key);
     parent.log("New Value     - " + e.newValue);
     parent.log("Old Value     - " + e.oldValue);
-    parent.log("URI           - " + parent.normalizeURL(e.uri));
+    parent.log("url           - " + parent.normalizeURL(e.url));
     parent.log("Storage Area  - " + ((e.storageArea == window.localStorage) ? "This window's window.localStorage" : "Another window's window.localStorage"));
     parent.log("");
 
diff --git a/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html b/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
index 2d7b004..97781b1 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
+++ b/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
@@ -7,7 +7,7 @@ function handleStorageEvent(e)
     parent.log("Key           - " + e.key);
     parent.log("New Value     - " + e.newValue);
     parent.log("Old Value     - " + e.oldValue);
-    parent.log("URI           - " + parent.normalizeURL(e.uri));
+    parent.log("url           - " + parent.normalizeURL(e.url));
     parent.log("Storage Area  - " + ((e.storageArea == window.sessionStorage) ? "This window's window.sessionStorage" : "Another window's window.sessionStorage"));
     parent.log("");
     
diff --git a/LayoutTests/storage/quota-tracking-expected.txt b/LayoutTests/storage/quota-tracking-expected.txt
index 62a2c6b..6d860f0 100644
--- a/LayoutTests/storage/quota-tracking-expected.txt
+++ b/LayoutTests/storage/quota-tracking-expected.txt
@@ -1,6 +1,6 @@
 UI DELEGATE DATABASE CALLBACK: exceededDatabaseQuotaForSecurityOrigin:{file, , 0} database:QuotaManagementDatabase2
 This test checks to make sure that quotas are enforced per-origin instead of per-database, as they were prior to http://trac.webkit.org/projects/webkit/changeset/29983.
-The test clears all databases, sets the quota for the origin to 32k, then tries to insert 17k of data into two databases. If things go as planned, the UI Delegate will be informed of the exceeded quota and should increase the quota for this origin. Inserting 17k of data the third time should succeed again.
+The test clears all databases, sets the quota for the origin to 40k, then tries to insert 17k of data into two databases. If things go as planned, the second insert should fail, the UI Delegate should be informed of the exceeded quota and should increase the quota for this origin. Inserting 17k of data the third time should succeed again.
 Adding a table
 Inserting some data
 Done adding data
diff --git a/LayoutTests/storage/quota-tracking.html b/LayoutTests/storage/quota-tracking.html
index 2b5b49d..6e52523 100644
--- a/LayoutTests/storage/quota-tracking.html
+++ b/LayoutTests/storage/quota-tracking.html
@@ -91,7 +91,7 @@ function runTest()
     if (window.layoutTestController) {
         layoutTestController.clearAllDatabases();
         layoutTestController.dumpDatabaseCallbacks();
-        layoutTestController.setDatabaseQuota(32768);
+        layoutTestController.setDatabaseQuota(40960);
         layoutTestController.dumpAsText();
         layoutTestController.waitUntilDone();
     }
@@ -105,7 +105,7 @@ function runTest()
 
 <body onload="runTest()">
 This test checks to make sure that quotas are enforced per-origin instead of per-database, as they were prior to http://trac.webkit.org/projects/webkit/changeset/29983.<br>
-The test clears all databases, sets the quota for the origin to 32k, then tries to insert 17k of data into two databases. If things go as planned, the UI Delegate will be informed of the exceeded quota and should increase the quota for this origin. Inserting 17k of data the third time should succeed again.
+The test clears all databases, sets the quota for the origin to 40k, then tries to insert 17k of data into two databases. If things go as planned, the second insert should fail, the UI Delegate should be informed of the exceeded quota and should increase the quota for this origin. Inserting 17k of data the third time should succeed again.
 <pre id="console">
 </pre>
 </body>