Diff
Modified: trunk/LayoutTests/ChangeLog (115469 => 115470)
--- trunk/LayoutTests/ChangeLog 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/ChangeLog 2012-04-27 19:31:24 UTC (rev 115470)
@@ -1,3 +1,24 @@
+2012-04-27 Erik Arvidsson <a...@chromium.org>
+
+ Clean up tests in preparation for ES5.2 global scope fix
+ https://bugs.webkit.org/show_bug.cgi?id=85001
+
+ Reviewed by Gavin Barraclough.
+
+ * fast/css/resize-value-compared.html:
+ * fast/dom/resources/navigation-type-matches-querystring.html:
+ * fast/dom/script-tests/webtiming-document-open.js:
+ * fast/dom/script-tests/webtiming-navigate-within-document.js:
+ * fast/dom/script-tests/webtiming.js:
+ * http/tests/inspector/indexeddb/indexeddb-test.js:
+ * http/tests/misc/resources/webtiming-cross-origin-and-back2.html:
+ * http/tests/misc/resources/webtiming-cross-origin-redirect.html:
+ * http/tests/misc/resources/webtiming-no-origin.html:
+ * http/tests/misc/resources/webtiming-one-redirect.html:
+ * http/tests/misc/resources/webtiming-ssl.html:
+ * http/tests/misc/resources/webtiming-two-redirects.html:
+ * http/tests/misc/webtiming-slow-load.php:
+
2012-04-27 Dirk Pranke <dpra...@chromium.org>
Unreviewed, revert r115453 - broke chromium win bots
Modified: trunk/LayoutTests/fast/css/resize-value-compared.html (115469 => 115470)
--- trunk/LayoutTests/fast/css/resize-value-compared.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/fast/css/resize-value-compared.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -16,8 +16,8 @@
if (window.layoutTestController)
layoutTestController.dumpAsText();
+ var target = document.getElementById("target");
target.style.resize = "both";
- var target = document.getElementById("target");
var computedStyle = getComputedStyle(target);
log(computedStyle.resize === "both" ? "PASS" : "FAIL");
</script>
Modified: trunk/LayoutTests/fast/dom/resources/navigation-type-matches-querystring.html (115469 => 115470)
--- trunk/LayoutTests/fast/dom/resources/navigation-type-matches-querystring.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/fast/dom/resources/navigation-type-matches-querystring.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -11,7 +11,7 @@
description("This tests that performance.navigation.type is " + expectedType);
- var performance = window.performance || {};
+ window.performance = window.performance || {};
var navigation = performance.navigation || {};
shouldBe("navigation.type", stringify(expectedType));
</script>
Modified: trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js (115469 => 115470)
--- trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js 2012-04-27 19:31:24 UTC (rev 115470)
@@ -1,4 +1,4 @@
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
var originalTiming = {};
Modified: trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js (115469 => 115470)
--- trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js 2012-04-27 19:31:24 UTC (rev 115470)
@@ -1,6 +1,6 @@
description("This test checks that navigating within the document does not reset Web Timing numbers.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var timing = performance.timing || {};
function checkTimingNotChanged()
Modified: trunk/LayoutTests/fast/dom/script-tests/webtiming.js (115469 => 115470)
--- trunk/LayoutTests/fast/dom/script-tests/webtiming.js 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/fast/dom/script-tests/webtiming.js 2012-04-27 19:31:24 UTC (rev 115470)
@@ -1,6 +1,6 @@
description("This test checks that all of the <a href=''>Web Timing</a> attributes are available and have reasonable values in the right order.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/inspector/indexeddb/indexeddb-test.js (115469 => 115470)
--- trunk/LayoutTests/http/tests/inspector/indexeddb/indexeddb-test.js 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/inspector/indexeddb/indexeddb-test.js 2012-04-27 19:31:24 UTC (rev 115470)
@@ -101,7 +101,7 @@
};
var indexedDB = window.indexeddb || window.webkitIndexedDB;
-var IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction;
+window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction;
function dispatchCallback(callbackId)
{
Modified: trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back2.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -9,7 +9,7 @@
<script>
description("If the destination and previous page have the same origin, then Web Timing should report unload timing.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -9,7 +9,7 @@
<script>
description("Web Timing should zero out redirect stats after a cross-origin redirect.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -9,7 +9,7 @@
<script>
description("Web Timing should report zeros for redirects and unload since there was no preceding page.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/misc/resources/webtiming-one-redirect.html (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-one-redirect.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-one-redirect.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -9,7 +9,7 @@
<script>
description("This test checks that Web Timing reports redirectCount correctly and has reasonable values for redirectStart and redirectCount.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/misc/resources/webtiming-ssl.html (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-ssl.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-ssl.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -11,7 +11,7 @@
<script>
description("This test checks that Web Timing reports secureConnectionStart correctly and has reasonable values for connectStart and connectEnd. Note that DumpRenderTree doesn't set secureConnectionStart.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/misc/resources/webtiming-two-redirects.html (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/resources/webtiming-two-redirects.html 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-two-redirects.html 2012-04-27 19:31:24 UTC (rev 115470)
@@ -9,7 +9,7 @@
<script>
description("This test checks that Web Timing reports redirectCount correctly and has reasonable values for redirectStart and redirectCount.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
Modified: trunk/LayoutTests/http/tests/misc/webtiming-slow-load.php (115469 => 115470)
--- trunk/LayoutTests/http/tests/misc/webtiming-slow-load.php 2012-04-27 19:24:18 UTC (rev 115469)
+++ trunk/LayoutTests/http/tests/misc/webtiming-slow-load.php 2012-04-27 19:31:24 UTC (rev 115470)
@@ -11,7 +11,7 @@
<script>
description("Verifies that requestStart and responseStart are available before the main document has finished loading.");
-var performance = window.performance || {};
+window.performance = window.performance || {};
var navigation = performance.navigation || {};
var timing = performance.timing || {};
