Diff
Modified: trunk/LayoutTests/ChangeLog (120797 => 120798)
--- trunk/LayoutTests/ChangeLog 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/ChangeLog 2012-06-20 05:12:22 UTC (rev 120798)
@@ -1,3 +1,41 @@
+2012-06-19 Kinuko Yasuda <[email protected]>
+
+ Use testRunner instead of layoutTestController in fast/{files,filesystem}
+ https://bugs.webkit.org/show_bug.cgi?id=89462
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/files/apply-blob-url-to-img.html:
+ * fast/files/apply-blob-url-to-xhr.html:
+ * fast/files/blob-builder-crash.html:
+ * fast/files/blob-slice-overflow.html:
+ * fast/files/blob-slice-test.html:
+ * fast/files/create-blob-url-crash.html:
+ * fast/files/domurl-script-execution-context-crash.html:
+ * fast/files/file-reader-abort.html:
+ * fast/files/file-reader-directory-crash.html:
+ * fast/files/file-reader-event-listener.html:
+ * fast/files/file-reader-file-url.html:
+ * fast/files/file-reader-sandbox-iframe.html:
+ * fast/files/null-origin-string.html:
+ * fast/files/read-blob-async.html:
+ * fast/files/read-file-async.html:
+ * fast/files/resources/file-reader-real.html:
+ * fast/files/resources/setup-for-read-common.js:
+ * fast/files/revoke-blob-url.html:
+ * fast/files/script-tests/xhr-response-blob.js:
+ * fast/files/workers/inline-worker-via-blob-url.html:
+ * fast/files/workers/worker-apply-blob-url-to-xhr.html:
+ * fast/files/workers/worker-read-blob-async.html:
+ * fast/files/workers/worker-read-blob-sync.html:
+ * fast/files/workers/worker-read-file-async.html:
+ * fast/files/workers/worker-read-file-sync.html:
+ * fast/filesystem/cross-filesystem-op.html:
+ * fast/filesystem/file-after-reload-crash.html:
+ * fast/filesystem/file-metadata-after-write.html:
+ * fast/filesystem/filesystem-no-callback-null-ptr-crash.html:
+ * fast/filesystem/filesystem-uri-origin.html:
+
2012-06-19 Takashi Sakamoto <[email protected]>
[Shadow DOM] ShadowRoot.host should be gone
Modified: trunk/LayoutTests/fast/files/apply-blob-url-to-img.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/apply-blob-url-to-img.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/apply-blob-url-to-img.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -25,8 +25,8 @@
var img = document.getElementById('imgToReplace');
log("New image: " + img.width + " x " + img.height);
log("DONE");
- if (layoutTestController.notifyDone)
- layoutTestController.notifyDone();
+ if (testRunner.notifyDone)
+ testRunner.notifyDone();
}
function moveMouseToCenterOfElement(element)
@@ -44,8 +44,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = runTests;
}
</script>
Modified: trunk/LayoutTests/fast/files/apply-blob-url-to-xhr.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/apply-blob-url-to-xhr.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/apply-blob-url-to-xhr.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -39,8 +39,8 @@
sendXMLHttpRequest("GET", fileURL);
log("DONE");
- if (layoutTestController.notifyDone)
- layoutTestController.notifyDone();
+ if (testRunner.notifyDone)
+ testRunner.notifyDone();
}
function runTests()
@@ -51,8 +51,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = runTests;
}
</script>
Modified: trunk/LayoutTests/fast/files/blob-builder-crash.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/blob-builder-crash.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/blob-builder-crash.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -16,8 +16,8 @@
log("DONE");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body _onload_="test()">
Modified: trunk/LayoutTests/fast/files/blob-slice-overflow.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/blob-slice-overflow.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/blob-slice-overflow.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -4,9 +4,9 @@
a truncated slice being returned.
<pre id='console'></pre>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone()
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone()
}
var text = '';
@@ -21,8 +21,8 @@
document.getElementById('console').appendChild(document.createTextNode('FAIL'));
}
-if (window.layoutTestController) {
- layoutTestController.notifyDone();
+if (window.testRunner) {
+ testRunner.notifyDone();
}
</script>
</body>
Modified: trunk/LayoutTests/fast/files/blob-slice-test.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/blob-slice-test.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/blob-slice-test.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -69,8 +69,8 @@
function runNextTest()
{
if (testIndex >= sliceParams.length) {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
return;
}
@@ -87,9 +87,9 @@
runNextTest();
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
</head>
Modified: trunk/LayoutTests/fast/files/create-blob-url-crash.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/create-blob-url-crash.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/create-blob-url-crash.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -20,8 +20,8 @@
log("DONE");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body _onload_="test()">
Modified: trunk/LayoutTests/fast/files/domurl-script-execution-context-crash.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/domurl-script-execution-context-crash.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/domurl-script-execution-context-crash.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -6,8 +6,8 @@
e.apply(w, ['webkitURL']);
} catch (ex) { }
document.body.innerHTML = "PASS: null security context for URL did not crash";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function load()
@@ -16,11 +16,11 @@
setTimeout(crash, 30);
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setCanOpenWindows();
- layoutTestController.setCloseRemainingWindowsWhenComplete(true);
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
+ testRunner.waitUntilDone();
}
e = (w = open()).eval;
Modified: trunk/LayoutTests/fast/files/file-reader-abort.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/file-reader-abort.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/file-reader-abort.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -27,8 +27,8 @@
reader._onloadend_ = function() {
log("Received loadend event");
log("DONE");
- if (layoutTestController.notifyDone)
- layoutTestController.notifyDone();
+ if (testRunner.notifyDone)
+ testRunner.notifyDone();
};
reader._onabort_ = function() {
log("Received abort event");
@@ -46,8 +46,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = runTests;
}
</script>
Modified: trunk/LayoutTests/fast/files/file-reader-directory-crash.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/file-reader-directory-crash.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/file-reader-directory-crash.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -15,14 +15,14 @@
reader.readAsText(file);
reader._onloadend_ = function() {
statusElement.textContent = "PASS, no crash";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
eventSender.beginDragWithFiles(['resources']);
Modified: trunk/LayoutTests/fast/files/file-reader-event-listener.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/file-reader-event-listener.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/file-reader-event-listener.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -45,8 +45,8 @@
fileReader.removeEventListener("load", onLoad, false);
fileReader.removeEventListener("error", onError, false);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function onAbort()
@@ -88,9 +88,9 @@
}
if (window.eventSender) {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window._onload_ = runTests;
} else {
Modified: trunk/LayoutTests/fast/files/file-reader-file-url.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/file-reader-file-url.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/file-reader-file-url.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -1,11 +1,11 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.setAllowUniversalAccessFromFileURLs(false);
- layoutTestController.setAllowFileAccessFromFileURLs(false);
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.setAllowUniversalAccessFromFileURLs(false);
+ testRunner.setAllowFileAccessFromFileURLs(false);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
</head>
Modified: trunk/LayoutTests/fast/files/file-reader-sandbox-iframe.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/file-reader-sandbox-iframe.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/file-reader-sandbox-iframe.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -1,11 +1,11 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.setAllowUniversalAccessFromFileURLs(false);
- layoutTestController.setAllowFileAccessFromFileURLs(false);
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.setAllowUniversalAccessFromFileURLs(false);
+ testRunner.setAllowFileAccessFromFileURLs(false);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
</head>
Modified: trunk/LayoutTests/fast/files/null-origin-string.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/null-origin-string.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/null-origin-string.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -16,14 +16,14 @@
reader.readAsText(file);
console.log('Started reading...');
- top.location = 'data:text/html,<p>PASS if no crash.</p><script>layoutTestController.notifyDone()</scr' + 'ipt>';
+ top.location = 'data:text/html,<p>PASS if no crash.</p><script>testRunner.notifyDone()</scr' + 'ipt>';
}
</script>
<script>
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
document.write('<iframe src="" type=file id=file _onchange_=\'onInputFileChange()\'><script>' + document.getElementsByTagName("script")[0].innerText + 'runTest()</scr' + 'ipt>" style="left:0px;top:0px"></iframe>');
</script>
Modified: trunk/LayoutTests/fast/files/read-blob-async.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/read-blob-async.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/read-blob-async.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -27,8 +27,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = function() { runTests(testFileInfoList); }
}
</script>
Modified: trunk/LayoutTests/fast/files/read-file-async.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/read-file-async.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/read-file-async.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -30,8 +30,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = function() { runTests(testFileInfoList); }
}
</script>
Modified: trunk/LayoutTests/fast/files/resources/file-reader-real.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/resources/file-reader-real.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/resources/file-reader-real.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -9,8 +9,8 @@
console.log("Received data: " + event.target.result);
}
reader._onloadend_ = function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
reader._onerror_ = function(event) {
console.log("Received error event: " + event.target.error.code);
Modified: trunk/LayoutTests/fast/files/resources/setup-for-read-common.js (120797 => 120798)
--- trunk/LayoutTests/fast/files/resources/setup-for-read-common.js 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/resources/setup-for-read-common.js 2012-06-20 05:12:22 UTC (rev 120798)
@@ -2,8 +2,8 @@
{
document.getElementById('console').appendChild(document.createTextNode(message + "\n"));
if (message == "DONE") {
- if (window && window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window && window.testRunner)
+ testRunner.notifyDone();
}
}
@@ -32,15 +32,15 @@
{
log(event.data);
if (event.data == "DONE") {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
worker._onerror_ = function(event)
{
log("Received error from worker: " + event.message);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
worker.postMessage(testFiles);
}
Modified: trunk/LayoutTests/fast/files/revoke-blob-url.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/revoke-blob-url.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/revoke-blob-url.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -32,8 +32,8 @@
log("DONE");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body _onload_="test()">
Modified: trunk/LayoutTests/fast/files/script-tests/xhr-response-blob.js (120797 => 120798)
--- trunk/LayoutTests/fast/files/script-tests/xhr-response-blob.js 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/script-tests/xhr-response-blob.js 2012-06-20 05:12:22 UTC (rev 120798)
@@ -1,7 +1,7 @@
description("Test that XHR.responseType = 'blob' gives you back a Blob.");
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
function testBlob(blobURL, blobType, doneFunction) {
window.xhr = new XMLHttpRequest();
@@ -23,8 +23,8 @@
testBlob("resources/UTF8.txt", "text/plain", function() {
testBlob("resources/does_not_exist.txt", "", function() {
testBlob("resources/empty-file", "", function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
})
})
});
Modified: trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -20,17 +20,17 @@
worker._onmessage_ = function(event) {
log(event.data);
log("DONE");
- if (layoutTestController.notifyDone)
- layoutTestController.notifyDone();
+ if (testRunner.notifyDone)
+ testRunner.notifyDone();
};
worker.postMessage();
}
-if (window.layoutTestController) {
- layoutTestController.setAllowUniversalAccessFromFileURLs(false);
- layoutTestController.setAllowFileAccessFromFileURLs(true);
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.setAllowUniversalAccessFromFileURLs(false);
+ testRunner.setAllowFileAccessFromFileURLs(true);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
</head>
Modified: trunk/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -18,15 +18,15 @@
{
log(event.data);
if (event.data == "DONE") {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
worker._onerror_ = function(event)
{
log("Received error from worker: " + event.message);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
worker.postMessage(file);
}
@@ -39,8 +39,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = runTests;
}
</script>
Modified: trunk/LayoutTests/fast/files/workers/worker-read-blob-async.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/workers/worker-read-blob-async.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/workers/worker-read-blob-async.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -20,8 +20,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = function() { runTests(testFileInfoList); }
}
</script>
Modified: trunk/LayoutTests/fast/files/workers/worker-read-blob-sync.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/workers/worker-read-blob-sync.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/workers/worker-read-blob-sync.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -20,8 +20,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = function() { runTests(testFileInfoList); }
}
</script>
Modified: trunk/LayoutTests/fast/files/workers/worker-read-file-async.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/workers/worker-read-file-async.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/workers/worker-read-file-async.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -23,8 +23,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = function() { runTests(testFileInfoList); }
}
</script>
Modified: trunk/LayoutTests/fast/files/workers/worker-read-file-sync.html (120797 => 120798)
--- trunk/LayoutTests/fast/files/workers/worker-read-file-sync.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/files/workers/worker-read-file-sync.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -23,8 +23,8 @@
}
if (window.eventSender) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
window._onload_ = function() { runTests(testFileInfoList); }
}
</script>
Modified: trunk/LayoutTests/fast/filesystem/cross-filesystem-op.html (120797 => 120798)
--- trunk/LayoutTests/fast/filesystem/cross-filesystem-op.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/filesystem/cross-filesystem-op.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -51,8 +51,8 @@
return function(e) {
console.log(e);
log('ERROR:' + msg + ': ' + e.code);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
};
}
@@ -235,8 +235,8 @@
log('Successfully ran ' + tests.length + ' tests.');
cleanupDirectory(destTestDirectory, function() {
log('Cleanup done.');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
});
});
});
@@ -249,9 +249,9 @@
}, false);
destination.addEventListener('drop', startTest, false);
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
eventSender.beginDragWithFiles([sourceDirectoryPath]);
eventSender.leapForward(100);
Modified: trunk/LayoutTests/fast/filesystem/file-after-reload-crash.html (120797 => 120798)
--- trunk/LayoutTests/fast/filesystem/file-after-reload-crash.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/filesystem/file-after-reload-crash.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -5,9 +5,9 @@
http://webkit.org/b/76461 -->
<script>
if (location.search != '?reenter') {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
webkitRequestFileSystem(TEMPORARY, 1024*1024,
@@ -15,14 +15,14 @@
} else {
document.write('PASS');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function onError(msg, e) {
document.body.innerText = 'FAIL: ' + e.code + ' msg = ' + msg;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function gotFS(fs) {
Modified: trunk/LayoutTests/fast/filesystem/file-metadata-after-write.html (120797 => 120798)
--- trunk/LayoutTests/fast/filesystem/file-metadata-after-write.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/filesystem/file-metadata-after-write.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -8,9 +8,9 @@
<div id='console'></div>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var fileEntryForCleanup;
@@ -79,8 +79,8 @@
function endTest()
{
- if (layoutTestController)
- layoutTestController.notifyDone();
+ if (testRunner)
+ testRunner.notifyDone();
}
</script>
Modified: trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html (120797 => 120798)
--- trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -4,8 +4,8 @@
-->
<div id="log">FAIL</div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
if (window.webkitRequestFileSystem) {
// These two calls should throw an exception but should NOT cause a NULL pointer crash:
webkitResolveLocalFileSystemURL('');
Modified: trunk/LayoutTests/fast/filesystem/filesystem-uri-origin.html (120797 => 120798)
--- trunk/LayoutTests/fast/filesystem/filesystem-uri-origin.html 2012-06-20 04:31:37 UTC (rev 120797)
+++ trunk/LayoutTests/fast/filesystem/filesystem-uri-origin.html 2012-06-20 05:12:22 UTC (rev 120798)
@@ -1,8 +1,8 @@
<a style="display:none" href=""
<p>This text should not be visible. It should be overwritten by the running of the test.</p>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var expectedOrigin = 'http://www.webkit.org:8080';
var actualOrigin = document.getElementsByTagName('a')[0].origin;
var resultElt = document.getElementsByTagName('p')[0];
