[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

Tue Jan 5 23:58:13 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 910daa15911382932d40f3f64034ad3112ebda67
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 04:31:13 2009 +0000

    2009-12-21  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Adam Barth.
    
            Upstream a test from chromium.org.
            https://bugs.webkit.org/show_bug.cgi?id=32761
    
            * http/tests/misc/resources/content-iframe.html: Added.
            * http/tests/misc/set-window-opener-to-null-expected.txt: Added.
            * http/tests/misc/set-window-opener-to-null.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3496e32..f5d15e2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-21  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Upstream a test from chromium.org.
+        https://bugs.webkit.org/show_bug.cgi?id=32761
+
+        * http/tests/misc/resources/content-iframe.html: Added.
+        * http/tests/misc/set-window-opener-to-null-expected.txt: Added.
+        * http/tests/misc/set-window-opener-to-null.html: Added.
+
 2009-12-21  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/http/tests/misc/resources/content-iframe.html b/LayoutTests/http/tests/misc/resources/content-iframe.html
new file mode 100644
index 0000000..2109a5e
--- /dev/null
+++ b/LayoutTests/http/tests/misc/resources/content-iframe.html
@@ -0,0 +1,4 @@
+<script>
+if (window.layoutTestController)
+  layoutTestController.globalFlag = true;
+</script>
diff --git a/LayoutTests/http/tests/misc/set-window-opener-to-null-expected.txt b/LayoutTests/http/tests/misc/set-window-opener-to-null-expected.txt
new file mode 100644
index 0000000..720805c
--- /dev/null
+++ b/LayoutTests/http/tests/misc/set-window-opener-to-null-expected.txt
@@ -0,0 +1,5 @@
+This tests that following code works in Chrome:
+var w = window.open(...);
+w.opener = null;
+After new page finishes loading, its opener should stay as null.
+PASS
diff --git a/LayoutTests/http/tests/misc/set-window-opener-to-null.html b/LayoutTests/http/tests/misc/set-window-opener-to-null.html
new file mode 100644
index 0000000..434280c
--- /dev/null
+++ b/LayoutTests/http/tests/misc/set-window-opener-to-null.html
@@ -0,0 +1,55 @@
+<html>
+<script>
+if (window.layoutTestController) {
+  layoutTestController.setCanOpenWindows();
+  layoutTestController.dumpAsText();
+  layoutTestController.waitUntilDone();
+  layoutTestController.globalFlag = false;
+}
+
+var w = window.open("http://127.0.0.1:8000/misc/resources/content-iframe.html");
+w.opener = null;
+
+function wait_to_start() {
+  var child_window_opened;
+
+  // polling layoutTestController.globalFlag or w.document
+  if (window.layoutTestController) {
+    child_window_opened = layoutTestController.globalFlag;
+  } else {
+    // polling w.document is not very reliable cross browsers,
+    // it works in chrome for manual testsing.
+    // We might want to change it to using postMessage when it
+    // is supported.
+    child_window_opened = !w.document;
+  }
+
+  if (!child_window_opened) {
+    setTimeout(wait_to_start, 30);
+    return;
+  }
+
+  var e = document.getElementById('console');
+  e.innerHTML = w.opener == null ? 'PASS' : 'FAIL';
+
+  w.close();
+
+  if (window.layoutTestController)
+    layoutTestController.notifyDone();
+}
+
+window.onload = wait_to_start;
+
+</script>
+<body>
+This tests that following code works in Chrome:
+<pre>
+var w = window.open(...);
+w.opener = null;
+</pre>
+After new page finishes loading, its opener should stay as null.
+
+<p>
+<div id="console">Running ...<div>
+</body>
+</html>

-- 
WebKit Debian packaging

