diff options
Diffstat (limited to 'LayoutTests')
31 files changed, 229 insertions, 36 deletions
diff --git a/LayoutTests/fast/events/touch/basic-multi-touch-events.html b/LayoutTests/fast/events/touch/basic-multi-touch-events.html index 951e169..cdf0a71 100644 --- a/LayoutTests/fast/events/touch/basic-multi-touch-events.html +++ b/LayoutTests/fast/events/touch/basic-multi-touch-events.html @@ -4,11 +4,16 @@ <link rel="stylesheet" href="../../js/resources/js-test-style.css"> <script src="../../js/resources/js-test-pre.js"></script> <script src="../../js/resources/js-test-post-function.js"></script> +<!-- + Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks + should be written in an asynchronous fashion so they can be run on mobile platforms like Android. + This template will generate an asynchronous style test by using the js-test-post-function script. + You will need to invoke isSuccessfullyParsed() in your test script when the test completes. +--> </head> <body> <p id="description"></p> <div id="console"></div> <script src="script-tests/basic-multi-touch-events.js"></script> - </body> </html> diff --git a/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt b/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt index ec168cb..47fa08a 100644 --- a/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt +++ b/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt @@ -32,10 +32,10 @@ PASS lastEvent.changedTouches.length is 1 PASS lastEvent.targetTouches.length is 1 PASS lastEvent.pageX is 0 PASS lastEvent.pageY is 0 -PASS lastEvent.touches[0].pageX is 20 -PASS lastEvent.touches[0].pageY is 15 -PASS lastEvent.touches[0].clientX is 20 -PASS lastEvent.touches[0].clientY is 15 +PASS lastEvent.touches[0].pageX is 50 +PASS lastEvent.touches[0].pageY is 50 +PASS lastEvent.touches[0].clientX is 50 +PASS lastEvent.touches[0].clientY is 50 PASS lastEvent.touches[0].identifier is 0 PASS lastEvent.shiftKey is true PASS lastEvent.altKey is true @@ -47,10 +47,10 @@ PASS lastEvent.changedTouches.length is 1 PASS lastEvent.targetTouches.length is 0 PASS lastEvent.pageX is 0 PASS lastEvent.pageY is 0 -PASS lastEvent.changedTouches[0].pageX is 20 -PASS lastEvent.changedTouches[0].pageY is 15 -PASS lastEvent.changedTouches[0].clientX is 20 -PASS lastEvent.changedTouches[0].clientY is 15 +PASS lastEvent.changedTouches[0].pageX is 50 +PASS lastEvent.changedTouches[0].pageY is 50 +PASS lastEvent.changedTouches[0].clientX is 50 +PASS lastEvent.changedTouches[0].clientY is 50 PASS lastEvent.changedTouches[0].identifier is 0 PASS lastEvent.shiftKey is false PASS lastEvent.altKey is false diff --git a/LayoutTests/fast/events/touch/basic-single-touch-events.html b/LayoutTests/fast/events/touch/basic-single-touch-events.html index 4f870f4..cd841a1 100644 --- a/LayoutTests/fast/events/touch/basic-single-touch-events.html +++ b/LayoutTests/fast/events/touch/basic-single-touch-events.html @@ -4,6 +4,12 @@ <link rel="stylesheet" href="../../js/resources/js-test-style.css"> <script src="../../js/resources/js-test-pre.js"></script> <script src="../../js/resources/js-test-post-function.js"></script> +<!-- + Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks + should be written in an asynchronous fashion so they can be run on mobile platforms like Android. + This template will generate an asynchronous style test by using the js-test-post-function script. + You will need to invoke isSuccessfullyParsed() in your test script when the test completes. +--> </head> <body> <p id="description"></p> diff --git a/LayoutTests/fast/events/touch/create-touch-event.html b/LayoutTests/fast/events/touch/create-touch-event.html index ace4459..17aa183 100644 --- a/LayoutTests/fast/events/touch/create-touch-event.html +++ b/LayoutTests/fast/events/touch/create-touch-event.html @@ -7,7 +7,7 @@ <body> <p id="description"></p> <div id="console"></div> -<script src="script-tests/create-touch-event.js"></script> +<script src="resources/create-touch-event.js"></script> <script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/events/touch/script-tests/create-touch-event.js b/LayoutTests/fast/events/touch/resources/create-touch-event.js index 78295d6..78295d6 100644 --- a/LayoutTests/fast/events/touch/script-tests/create-touch-event.js +++ b/LayoutTests/fast/events/touch/resources/create-touch-event.js diff --git a/LayoutTests/fast/events/touch/resources/send-touch-up.html b/LayoutTests/fast/events/touch/resources/send-touch-up.html new file mode 100644 index 0000000..8b7380f --- /dev/null +++ b/LayoutTests/fast/events/touch/resources/send-touch-up.html @@ -0,0 +1,39 @@ +<html> +<head> +<title></title> +<script type='text/javascript'> +function doGC() +{ + if (window.GCController) + return GCController.collect(); + + if (window.gc) + return window.gc(); + + for (var i = 0; i < 10000; i++) + var s = new String(""); +} + +function sendTouchUp() +{ + doGC(); + // This touchend will cause a crash if the bug is present. + eventSender.releaseTouchPoint(0); + eventSender.touchEnd(); + // This touchstart will finish the test when we don't crash. + eventSender.addTouchPoint(10,10); + eventSender.touchStart(); +} + +function finishTest(e) +{ + layoutTestController.notifyDone(); +} + +document.ontouchstart = finishTest; +</script> +</head> +<body onload="sendTouchUp();"> +<p>If the test doesn't crash, then PASS</p> +</body> +</html> diff --git a/LayoutTests/fast/events/touch/resources/touch-stale-node-crash.js b/LayoutTests/fast/events/touch/resources/touch-stale-node-crash.js new file mode 100644 index 0000000..c546a69 --- /dev/null +++ b/LayoutTests/fast/events/touch/resources/touch-stale-node-crash.js @@ -0,0 +1,20 @@ +document.ontouchstart = touchStartHandler; + +function touchStartHandler(e) +{ + var target = e.touches[0].target; + document.body.removeChild(target); + window.location = 'resources/send-touch-up.html'; +} + +description("If this test does not crash then you pass!"); + +if (window.layoutTestController) + layoutTestController.waitUntilDone(); + +if (window.eventSender) { + eventSender.clearTouchPoints(); + eventSender.addTouchPoint(50, 150); + eventSender.touchStart(); +} else + debug('This test requires DRT.'); diff --git a/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html b/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html index 1951c43..fd006b9 100644 --- a/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html +++ b/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html @@ -3,11 +3,17 @@ <head> <link rel="stylesheet" href="../../js/resources/js-test-style.css"> <script src="../../js/resources/js-test-pre.js"></script> +<script src="../../js/resources/js-test-post-function.js"></script> +<!-- + Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks + should be written in an asynchronous fashion so they can be run on mobile platforms like Android. + This template will generate an asynchronous style test by using the js-test-post-function script. + You will need to invoke isSuccessfullyParsed() in your test script when the test completes. +--> </head> <body> <p id="description"></p> <div id="console"></div> <script src="YOUR_JS_FILE_HERE"></script> -<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js b/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js index 9975c87..756f49e 100644 --- a/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js +++ b/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js @@ -62,7 +62,7 @@ function verifyTouch(which) { break; case 1: verifyTouchEvent("touchmove", 1, 1, 1); - verifyTouchPoint("touches", 0, 20, 15, 0); + verifyTouchPoint("touches", 0, 50, 50, 0); shouldBe("lastEvent.shiftKey", "true"); shouldBe("lastEvent.altKey", "true"); shouldBe("lastEvent.ctrlKey", "false"); @@ -70,7 +70,7 @@ function verifyTouch(which) { break; case 2: verifyTouchEvent("touchend", 0, 1, 0); - verifyTouchPoint("changedTouches", 0, 20, 15, 0); + verifyTouchPoint("changedTouches", 0, 50, 50, 0); shouldBe("lastEvent.shiftKey", "false"); shouldBe("lastEvent.altKey", "false"); break; @@ -92,7 +92,7 @@ function singleTouchSequence() eventSender.addTouchPoint(10, 10); eventSender.touchStart(); - eventSender.updateTouchPoint(0, 20, 15); + eventSender.updateTouchPoint(0, 50, 50); eventSender.setTouchModifier("shift", true); eventSender.setTouchModifier("alt", true); eventSender.touchMove(); @@ -106,7 +106,7 @@ function singleTouchSequence() function touchTargets() { - eventSender.addTouchPoint(10, 10); + eventSender.addTouchPoint(20, 20); eventSender.touchStart(); eventSender.updateTouchPoint(0, 1000, 1000); diff --git a/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js b/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js index 01eac2f..c83daa4 100644 --- a/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js +++ b/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js @@ -13,6 +13,7 @@ function touchcancelHandler() { shouldBe("cancelEvent.pageY", touchY.toString()); if (window.layoutTestController) { layoutTestController.notifyDone(); + isSuccessfullyParsed(); } } diff --git a/LayoutTests/fast/events/touch/script-tests/touch-target.js b/LayoutTests/fast/events/touch/script-tests/touch-target.js index 0623811..8e47f23 100644 --- a/LayoutTests/fast/events/touch/script-tests/touch-target.js +++ b/LayoutTests/fast/events/touch/script-tests/touch-target.js @@ -1,3 +1,6 @@ +var targetsDiv = document.createElement("div"); +targetsDiv.id = "targetsDiv"; + var div1 = document.createElement("div"); div1.id = "targetA"; div1.style.width = "100px"; @@ -13,9 +16,10 @@ div2.style.backgroundColor = "green"; var touchStartCount = 0; var touchMoveCount = 0; -document.getElementById('targetsDiv').appendChild(div1); -document.getElementById('targetsDiv').appendChild(document.createElement('br')); -document.getElementById('targetsDiv').appendChild(div2); +document.body.insertBefore(targetsDiv, document.getElementById('console')); +targetsDiv.appendChild(div1); +targetsDiv.appendChild(document.createElement('br')); +targetsDiv.appendChild(div2); function touchStartHandler() { diff --git a/LayoutTests/fast/events/touch/send-oncancel-event.html b/LayoutTests/fast/events/touch/send-oncancel-event.html index 5665c0c..0c913fb 100644 --- a/LayoutTests/fast/events/touch/send-oncancel-event.html +++ b/LayoutTests/fast/events/touch/send-oncancel-event.html @@ -3,11 +3,17 @@ <head> <link rel="stylesheet" href="../../js/resources/js-test-style.css"> <script src="../../js/resources/js-test-pre.js"></script> +<script src="../../js/resources/js-test-post-function.js"></script> +<!-- + Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks + should be written in an asynchronous fashion so they can be run on mobile platforms like Android. + This template will generate an asynchronous style test by using the js-test-post-function script. + You will need to invoke isSuccessfullyParsed() in your test script when the test completes. +--> </head> <body> <p id="description"></p> <div id="console"></div> <script src="script-tests/send-oncancel-event.js"></script> -<script src="../../js/resources/js-test-post.js"></script> </body> </html> diff --git a/LayoutTests/fast/events/touch/touch-stale-node-crash-expected.txt b/LayoutTests/fast/events/touch/touch-stale-node-crash-expected.txt new file mode 100644 index 0000000..cec9f36 --- /dev/null +++ b/LayoutTests/fast/events/touch/touch-stale-node-crash-expected.txt @@ -0,0 +1 @@ +If the test doesn't crash, then PASS diff --git a/LayoutTests/fast/events/touch/touch-stale-node-crash.html b/LayoutTests/fast/events/touch/touch-stale-node-crash.html new file mode 100644 index 0000000..5e1c65a --- /dev/null +++ b/LayoutTests/fast/events/touch/touch-stale-node-crash.html @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> +<html> +<head> +<link rel="stylesheet" href="../../js/resources/js-test-style.css"> +<script src="../../js/resources/js-test-pre.js"></script> +<script src="../../js/resources/js-test-post-function.js"></script> +</head> +<body> +<p id="description"></p> +<div style="background-color:red;height:100px;width:100px;"></div> +<div id="console"></div> +<script src="resources/touch-stale-node-crash.js"></script> +</body> +</html> diff --git a/LayoutTests/fast/events/touch/touch-target.html b/LayoutTests/fast/events/touch/touch-target.html index dfd8dab..3447e73 100644 --- a/LayoutTests/fast/events/touch/touch-target.html +++ b/LayoutTests/fast/events/touch/touch-target.html @@ -4,10 +4,15 @@ <link rel="stylesheet" href="../../js/resources/js-test-style.css"> <script src="../../js/resources/js-test-pre.js"></script> <script src="../../js/resources/js-test-post-function.js"></script> +<!-- + Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks + should be written in an asynchronous fashion so they can be run on mobile platforms like Android. + This template will generate an asynchronous style test by using the js-test-post-function script. + You will need to invoke isSuccessfullyParsed() in your test script when the test completes. +--> </head> <body> <p id="description"></p> -<div id="targetsDiv"></div> <div id="console"></div> <script src="script-tests/touch-target.js"></script> </body> diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/apache2-debian-httpd.conf index b8918db..7ef645f 100644 --- a/LayoutTests/http/conf/apache2-debian-httpd.conf +++ b/LayoutTests/http/conf/apache2-debian-httpd.conf @@ -681,7 +681,7 @@ ServerSignature On RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/conf/apache2-httpd.conf b/LayoutTests/http/conf/apache2-httpd.conf index e915fa7..6b55a95 100644 --- a/LayoutTests/http/conf/apache2-httpd.conf +++ b/LayoutTests/http/conf/apache2-httpd.conf @@ -702,7 +702,7 @@ ServerSignature On RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/conf/fedora-httpd.conf b/LayoutTests/http/conf/fedora-httpd.conf index 62100c8..b1560a9 100644 --- a/LayoutTests/http/conf/fedora-httpd.conf +++ b/LayoutTests/http/conf/fedora-httpd.conf @@ -882,7 +882,7 @@ AddHandler send-as-is asis RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/conf/httpd.conf b/LayoutTests/http/conf/httpd.conf index 6e6157c..347deb4 100644 --- a/LayoutTests/http/conf/httpd.conf +++ b/LayoutTests/http/conf/httpd.conf @@ -737,7 +737,7 @@ ServerSignature On RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/tests/appcache/credential-url-expected.txt b/LayoutTests/http/tests/appcache/credential-url-expected.txt new file mode 100644 index 0000000..3076236 --- /dev/null +++ b/LayoutTests/http/tests/appcache/credential-url-expected.txt @@ -0,0 +1,3 @@ +Test that application cache doesn't block loading resources from the same origin with credential. + +SUCCESS diff --git a/LayoutTests/http/tests/appcache/credential-url.html b/LayoutTests/http/tests/appcache/credential-url.html new file mode 100644 index 0000000..b6c7eec --- /dev/null +++ b/LayoutTests/http/tests/appcache/credential-url.html @@ -0,0 +1,28 @@ +<html manifest="http://user:password@127.0.0.1:8000/appcache/resources/empty.manifest"> +<body> +<p>Test that application cache doesn't block loading resources from the same origin with credential.</p> +<script> +if (window.layoutTestController) { + layoutTestController.dumpAsText(); + layoutTestController.waitUntilDone(); +} + +function test() +{ + var ifr = document.createElement("iframe"); + ifr.setAttribute("src", "javascript:parent.success(), 'PASS'"); + document.body.appendChild(ifr); +} + +function success() +{ + document.body.replaceChild(document.createTextNode("SUCCESS"), document.getElementsByTagName("iframe")[0]); + if (window.layoutTestController) + layoutTestController.notifyDone(); +} + +applicationCache.oncached = test; +applicationCache.onnoupdate = test; +</script> +<body> +</html> diff --git a/LayoutTests/http/tests/appcache/different-https-origin-resource-main-expected.txt b/LayoutTests/http/tests/appcache/different-https-origin-resource-main-expected.txt new file mode 100644 index 0000000..0dfbdc0 --- /dev/null +++ b/LayoutTests/http/tests/appcache/different-https-origin-resource-main-expected.txt @@ -0,0 +1,4 @@ +Test that a resource from a different https origin is not cached. + +PASS + diff --git a/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html b/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html new file mode 100644 index 0000000..55e744f --- /dev/null +++ b/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html @@ -0,0 +1,19 @@ +<html> +<body> +<script> +if (window.layoutTestController) { + layoutTestController.waitUntilDone(); + layoutTestController.dumpAsText(); +} + +window.addEventListener("message", function(e) { + document.getElementById("result").innerHTML = e.data; + if (window.layoutTestController) + layoutTestController.notifyDone(); +}, false); +</script> +<p>Test that a resource from a different https origin is not cached.</p> +<div id=result></div> +<iframe src="https://127.0.0.1:8443/appcache/resources/different-https-origin-resource.html"></iframe> +</body> +</html> diff --git a/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.html b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.html new file mode 100644 index 0000000..674706a --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.html @@ -0,0 +1,29 @@ +<html manifest="https://127.0.0.1:8443/appcache/resources/different-https-origin-resource.manifest"> +<script> +var hadError = false; +var result; + +function finish() +{ + if (!hadError) + result = "PASS"; + parent.postMessage(result, '*'); +} +function fail() +{ + result = "FAIL: Different https origin resource is getting downloaded to cache."; + hadError = true; +} +function error() +{ + result = "ERROR"; + hadError = true; + finish(); +} + +applicationCache.onprogress = function() { fail(); } +applicationCache.onnoupdate = function() { finish(); } +applicationCache.oncached = function() { finish(); } +applicationCache.onerror = function() { error(); } +</script> +</html> diff --git a/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.manifest b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.manifest new file mode 100644 index 0000000..75a58a4 --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.manifest @@ -0,0 +1,3 @@ +CACHE MANIFEST +CACHE: +https://localhost:8443/appcache/resources/simple.txt 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> |