[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:42:03 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit bdb413331e2552364f419e9147d258f5735a8387
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 8 21:27:58 2009 +0000
2009-10-08 Aaron Boodman <aa at chromium.org>
Reviewed by Eric Seidel.
r49278 added support for reusing isolated worlds, and the
corresponding change to Chromium's LayoutTestController changed
to expect two arguments. The first argument is the world that
the script should run in.
This change fixes the tests by updating them all to pass 0
for the world id. The specific world id used for these tests
doesn't really matter because they don't test world interaction.
https://bugs.webkit.org/show_bug.cgi?id=30231
* http/tests/security/isolatedWorld/all-window-properties.html:
* http/tests/security/isolatedWorld/all-window-prototypes.html:
* http/tests/security/isolatedWorld/body-properties.html:
* http/tests/security/isolatedWorld/body-prototype.html:
* http/tests/security/isolatedWorld/click-event.html:
* http/tests/security/isolatedWorld/document-open.html:
* http/tests/security/isolatedWorld/document-properties.html:
* http/tests/security/isolatedWorld/document-prototype.html:
* http/tests/security/isolatedWorld/global-variables.html:
* http/tests/security/isolatedWorld/image-properties.html:
* http/tests/security/isolatedWorld/image-prototype.html:
* http/tests/security/isolatedWorld/location-properties.html:
* http/tests/security/isolatedWorld/location-prototype.html:
* http/tests/security/isolatedWorld/number-prototype.html:
* http/tests/security/isolatedWorld/object-prototype.html:
* http/tests/security/isolatedWorld/storage-properties.html:
* http/tests/security/isolatedWorld/storage-prototype.html:
* http/tests/security/isolatedWorld/string-prototype.html:
* http/tests/security/isolatedWorld/window-properties.html:
* http/tests/security/isolatedWorld/window-setTimeout-function.html:
* http/tests/security/isolatedWorld/window-setTimeout-string.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49321 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a72348d..eb67389 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,40 @@
+2009-10-08 Aaron Boodman <aa at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ r49278 added support for reusing isolated worlds, and the
+ corresponding change to Chromium's LayoutTestController changed
+ to expect two arguments. The first argument is the world that
+ the script should run in.
+
+ This change fixes the tests by updating them all to pass 0
+ for the world id. The specific world id used for these tests
+ doesn't really matter because they don't test world interaction.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30231
+
+ * http/tests/security/isolatedWorld/all-window-properties.html:
+ * http/tests/security/isolatedWorld/all-window-prototypes.html:
+ * http/tests/security/isolatedWorld/body-properties.html:
+ * http/tests/security/isolatedWorld/body-prototype.html:
+ * http/tests/security/isolatedWorld/click-event.html:
+ * http/tests/security/isolatedWorld/document-open.html:
+ * http/tests/security/isolatedWorld/document-properties.html:
+ * http/tests/security/isolatedWorld/document-prototype.html:
+ * http/tests/security/isolatedWorld/global-variables.html:
+ * http/tests/security/isolatedWorld/image-properties.html:
+ * http/tests/security/isolatedWorld/image-prototype.html:
+ * http/tests/security/isolatedWorld/location-properties.html:
+ * http/tests/security/isolatedWorld/location-prototype.html:
+ * http/tests/security/isolatedWorld/number-prototype.html:
+ * http/tests/security/isolatedWorld/object-prototype.html:
+ * http/tests/security/isolatedWorld/storage-properties.html:
+ * http/tests/security/isolatedWorld/storage-prototype.html:
+ * http/tests/security/isolatedWorld/string-prototype.html:
+ * http/tests/security/isolatedWorld/window-properties.html:
+ * http/tests/security/isolatedWorld/window-setTimeout-function.html:
+ * http/tests/security/isolatedWorld/window-setTimeout-string.html:
+
2009-10-08 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html b/LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html
index 2aef31b..cd36c4e 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html
@@ -13,6 +13,7 @@ for (p in window) {
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"(function() {\n" +
" for (p in window) {\n" +
" var obj = window[p];\n" +
diff --git a/LayoutTests/http/tests/security/isolatedWorld/all-window-prototypes.html b/LayoutTests/http/tests/security/isolatedWorld/all-window-prototypes.html
index da5fc20..9bc433a 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/all-window-prototypes.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/all-window-prototypes.html
@@ -12,6 +12,7 @@ for (p in window) {
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"(function() {\n" +
" for (p in window) {\n" +
" var obj = window[p];\n" +
diff --git a/LayoutTests/http/tests/security/isolatedWorld/body-properties.html b/LayoutTests/http/tests/security/isolatedWorld/body-properties.html
index fef7d84..7c9822f 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/body-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/body-properties.html
@@ -7,6 +7,7 @@ document.body.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = document.body.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/body-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/body-prototype.html
index d8a9e65..a60a64d 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/body-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/body-prototype.html
@@ -7,6 +7,7 @@ document.body.__proto__.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = document.body.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/click-event.html b/LayoutTests/http/tests/security/isolatedWorld/click-event.html
index 26841f6..81dd9dd 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/click-event.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/click-event.html
@@ -15,7 +15,7 @@ bt.click();
document.body.world = 'Main';
if (window.layoutTestController) {
layoutTestController.dumpAsText();
- layoutTestController.evaluateScriptInIsolatedWorld(document.getElementById('isolatedScript').innerHTML);
+ layoutTestController.evaluateScriptInIsolatedWorld(0, document.getElementById('isolatedScript').innerHTML);
}
</script>
</body>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/document-open.html b/LayoutTests/http/tests/security/isolatedWorld/document-open.html
index 7be4f09..6462ed4 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/document-open.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/document-open.html
@@ -7,6 +7,7 @@ window.open = function () { alert("FAIL: Visible in isolated world."); };
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"window.open = function () { alert('PASS'); };\n" +
"document.open(1, 2, 3);");
}
diff --git a/LayoutTests/http/tests/security/isolatedWorld/document-properties.html b/LayoutTests/http/tests/security/isolatedWorld/document-properties.html
index 90dd8c3..172b79e 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/document-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/document-properties.html
@@ -7,6 +7,7 @@ document.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = document.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/document-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/document-prototype.html
index 52c60d4..604ab02 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/document-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/document-prototype.html
@@ -7,6 +7,7 @@ document.__proto__.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = document.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/global-variables.html b/LayoutTests/http/tests/security/isolatedWorld/global-variables.html
index c0d1c94..020d94d 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/global-variables.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/global-variables.html
@@ -7,6 +7,7 @@ var foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = window.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/image-properties.html b/LayoutTests/http/tests/security/isolatedWorld/image-properties.html
index 26173ed..caa3694 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/image-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/image-properties.html
@@ -7,6 +7,7 @@ Image.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = Image.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/image-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/image-prototype.html
index d4f104e..fc4acce 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/image-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/image-prototype.html
@@ -7,6 +7,7 @@ Image.__proto__.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = Image.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/location-properties.html b/LayoutTests/http/tests/security/isolatedWorld/location-properties.html
index 7d338e1..3d2de9b 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/location-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/location-properties.html
@@ -7,6 +7,7 @@ location.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = location.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/location-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/location-prototype.html
index 371ba60..b8998f2 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/location-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/location-prototype.html
@@ -7,6 +7,7 @@ location.__proto__.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = location.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/number-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/number-prototype.html
index 8ff8753..6361632 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/number-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/number-prototype.html
@@ -7,6 +7,7 @@ Number.prototype.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = (42).foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/object-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/object-prototype.html
index 5df7dc7..3d144bf 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/object-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/object-prototype.html
@@ -7,6 +7,7 @@ Object.prototype.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = {}.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/storage-properties.html b/LayoutTests/http/tests/security/isolatedWorld/storage-properties.html
index 19c55c2..9b0ad12 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/storage-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/storage-properties.html
@@ -10,6 +10,7 @@ sessionStorage.foo = "Visible";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = localStorage.foo + ' and ' + sessionStorage.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/storage-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/storage-prototype.html
index 2ed77e3..411f2b9 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/storage-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/storage-prototype.html
@@ -10,6 +10,7 @@ sessionStorage.__proto__.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = localStorage.foo + ' and ' + sessionStorage.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/string-prototype.html b/LayoutTests/http/tests/security/isolatedWorld/string-prototype.html
index 3a05fcc..15460ac 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/string-prototype.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/string-prototype.html
@@ -7,6 +7,7 @@ String.prototype.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = ''.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/window-properties.html b/LayoutTests/http/tests/security/isolatedWorld/window-properties.html
index d1ce539..75b759b 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/window-properties.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/window-properties.html
@@ -7,6 +7,7 @@ window.foo = "FAIL: Visible in isolated world.";
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.getElementById('console').innerHTML = window.foo");
}
</script>
diff --git a/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-function.html b/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-function.html
index 40e95ce..5b1a514 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-function.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-function.html
@@ -16,6 +16,7 @@ if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.foo = 'PASS';\n" +
"window.func = function () {\n" +
" alert(document.foo);\n" +
diff --git a/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-string.html b/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-string.html
index 772a715..f066c59 100644
--- a/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-string.html
+++ b/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-string.html
@@ -16,6 +16,7 @@ if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
layoutTestController.evaluateScriptInIsolatedWorld(
+ 0,
"document.foo = 'PASS';\n" +
"window.func = function () {\n" +
" alert(document.foo);\n" +
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list