Diff
Modified: branches/safari-536.26-branch/LayoutTests/ChangeLog (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/ChangeLog 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/ChangeLog 2012-08-23 02:33:37 UTC (rev 126384)
@@ -1,3 +1,22 @@
+2012-08-22 Mark Lam <[email protected]>
+
+ Fix some tests on safari-536.26-branch.
+ https://bugs.webkit.org/show_bug.cgi?id=94759
+
+ Reviewed by Mark Rowe.
+
+ * animations/animation-shorthand-name-order.html:
+ * compositing/repaint/newly-composited-on-scroll.html:
+ * editing/execCommand/crash-extend-selection-forward.html:
+ * fast/events/drag-display-none-element.html:
+ * fast/forms/autocomplete-off-with-default-value-does-not-clear.html:
+ * fast/forms/hidden/change-type-to-hidden-after-updating-value.html:
+ * fast/table/auto-table-layout-colgroup-removal-crash.html:
+ * fast/text/title-crash-expected.txt: Added.
+ * http/tests/security/video-poster-cross-origin-crash.html:
+ * platform/mac/editing/spelling/autocorrection-blockquote-crash-expected.txt:
+ * plugins/npruntime/overrides-all-properties.html:
+
2012-08-20 Mark Rowe <[email protected]>
Merge r122354.
Modified: branches/safari-536.26-branch/LayoutTests/animations/animation-shorthand-name-order.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/animations/animation-shorthand-name-order.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/animations/animation-shorthand-name-order.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -121,16 +121,16 @@
if (numTestsComplete < TEST_INPUTS.length)
runIndividualTest(numTestsComplete);
else {
- if (window.testRunner)
- testRunner.notifyDone();
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
}
}, 0);
}, 0);
}
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
}
window.addEventListener("load", runTests, false);
Modified: branches/safari-536.26-branch/LayoutTests/compositing/repaint/newly-composited-on-scroll.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/compositing/repaint/newly-composited-on-scroll.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/compositing/repaint/newly-composited-on-scroll.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -56,22 +56,22 @@
<script src=""
<script>
- if (window.testRunner) {
- testRunner.dumpAsText(true);
- testRunner.waitUntilDone();
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText(true);
+ layoutTestController.waitUntilDone();
}
function repaintTest() {
- if (window.testRunner)
- testRunner.display();
+ if (window.layoutTestController)
+ layoutTestController.display();
document.getElementById('overflow').scrollTop = 30;
- if (window.testRunner)
- testRunner.display();
+ if (window.layoutTestController)
+ layoutTestController.display();
window.setTimeout(function() {
document.getElementById('overflow').scrollTop = 50;
- testRunner.notifyDone();
+ layoutTestController.notifyDone();
}, 0);
}
Modified: branches/safari-536.26-branch/LayoutTests/editing/execCommand/crash-extend-selection-forward.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/editing/execCommand/crash-extend-selection-forward.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/editing/execCommand/crash-extend-selection-forward.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -3,9 +3,9 @@
<body>
<script src=""
<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
}
function editingTest() {
@@ -15,8 +15,8 @@
extendSelectionForwardByLineCommand();
test1.innerHTML = "PASS. WebKit didn't crash.";
- if (window.testRunner)
- testRunner.notifyDone();
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
}
</script>
<pre id="console"></pre>
Modified: branches/safari-536.26-branch/LayoutTests/fast/events/drag-display-none-element.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/fast/events/drag-display-none-element.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/fast/events/drag-display-none-element.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -12,16 +12,16 @@
{
var dragme = document.getElementById('dragme');
dragme.addEventListener('dragend', function () {
- if (window.testRunner)
- testRunner.notifyDone();
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
document.getElementById('console').appendChild(document.createTextNode('PASS'));
});
- if (!window.testRunner)
+ if (!window.layoutTestController)
return;
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpAsText();
eventSender.mouseMoveTo(dragme.offsetLeft + dragme.offsetWidth / 2, dragme.offsetTop + dragme.offsetHeight / 2);
eventSender.mouseDown();
Modified: branches/safari-536.26-branch/LayoutTests/fast/forms/autocomplete-off-with-default-value-does-not-clear.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/fast/forms/autocomplete-off-with-default-value-does-not-clear.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/fast/forms/autocomplete-off-with-default-value-does-not-clear.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -1,9 +1,9 @@
<script>
-if (window.testRunner) {
- testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
+if (window.layoutTestController) {
+ layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
}
function loaded()
@@ -21,8 +21,8 @@
function finishUp()
{
document.getElementById("logger").innerText = document.getElementById("testInput").value;
- if (window.testRunner)
- testRunner.notifyDone();
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
}
</script>
Modified: branches/safari-536.26-branch/LayoutTests/fast/forms/hidden/change-type-to-hidden-after-updating-value.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/fast/forms/hidden/change-type-to-hidden-after-updating-value.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/fast/forms/hidden/change-type-to-hidden-after-updating-value.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -1,7 +1,7 @@
<input type="text" id="input1">
<script>
-if (window.testRunner)
- testRunner.dumpAsText();
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
document.getElementById('input1').value = 'value';
document.getElementById('input1').type = 'hidden';
document.write('PASS unless crashed.');
Modified: branches/safari-536.26-branch/LayoutTests/fast/table/auto-table-layout-colgroup-removal-crash.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/fast/table/auto-table-layout-colgroup-removal-crash.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/fast/table/auto-table-layout-colgroup-removal-crash.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -8,8 +8,8 @@
<colgroup id="colGroup"></colgroup>
</table>
<script>
- if (window.testRunner)
- testRunner.dumpAsText();
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
document.body.offsetTop;
table.removeChild(colGroup);
Added: branches/safari-536.26-branch/LayoutTests/fast/text/title-crash-expected.txt (0 => 126384)
--- branches/safari-536.26-branch/LayoutTests/fast/text/title-crash-expected.txt (rev 0)
+++ branches/safari-536.26-branch/LayoutTests/fast/text/title-crash-expected.txt 2012-08-23 02:33:37 UTC (rev 126384)
@@ -0,0 +1 @@
+This test passes if it does not crash.
Modified: branches/safari-536.26-branch/LayoutTests/http/tests/security/video-poster-cross-origin-crash.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/http/tests/security/video-poster-cross-origin-crash.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/http/tests/security/video-poster-cross-origin-crash.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -1,8 +1,8 @@
<sub id=tCF1></sub>>>><button hidden=false id=tCF7>><video crossorigin="" poster="http://localhost:8080/misc/resources/compass.jpg">><style>
.c29:nth-child(1814762996n + 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999) { -webkit-locale: "zh_CN";</style><script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
}
docElement = document.body ? document.body : document.documentElement;
function initCF() {
@@ -18,6 +18,6 @@
try { if (tCF1 != docElement) tCF1.parentNode.removeChild(tCF1); } catch(e) {}
window.scrollBy(-484, -400);
try { tCF7.innerText = tCF44.textContent; } catch(e) {}
-if (window.testRunner)
- testRunner.notifyDone();
+if (window.layoutTestController)
+ layoutTestController.notifyDone();
}</script>
Modified: branches/safari-536.26-branch/LayoutTests/platform/mac/editing/spelling/autocorrection-blockquote-crash-expected.txt (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/platform/mac/editing/spelling/autocorrection-blockquote-crash-expected.txt 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/platform/mac/editing/spelling/autocorrection-blockquote-crash-expected.txt 2012-08-23 02:33:37 UTC (rev 126384)
@@ -1,4 +1,5 @@
-This test checks that markers are correct when auto correcting in the blockquote. If you type "n" and " ", there should be blue dots under information, but is off by one.
+This test checks that markers are correct when auto correcting in the blockquote. If you type "n" and " ", there should be blue dots under information, but is off by one.
+Note, this test can fail due to user specific spell checking data. If the user has previously dismissed 'notational' as the correct spelling of 'notationl' several times, the spell checker will not provide 'information' as a suggestion anymore. To fix this, remove all files in ~/Library/Spelling.
PASS internals.hasAutocorrectedMarker(document, 0, 1) is true
PASS successfullyParsed is true
Modified: branches/safari-536.26-branch/LayoutTests/plugins/npruntime/overrides-all-properties.html (126383 => 126384)
--- branches/safari-536.26-branch/LayoutTests/plugins/npruntime/overrides-all-properties.html 2012-08-23 01:56:54 UTC (rev 126383)
+++ branches/safari-536.26-branch/LayoutTests/plugins/npruntime/overrides-all-properties.html 2012-08-23 02:33:37 UTC (rev 126384)
@@ -1,18 +1,18 @@
<head>
<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
}
function runTest() {
- if (!window.testRunner) {
+ if (!window.layoutTestController) {
log("This test can only be run under WebKit's testRunner environment");
return;
}
- testRunner.evaluateScriptInIsolatedWorld(0, " \
+ layoutTestController.evaluateScriptInIsolatedWorld(0, " \
function test(msg, expected) \
{ \
var console = document.getElementById('console'); \
@@ -50,8 +50,8 @@
test(Object.getOwnPropertyDescriptor(pluginObject, 'getAttribute'), 'undefined'); \
");
- if (window.testRunner)
- testRunner.notifyDone();
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
}
</script>
</head>
