[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 00:31:14 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit fefbdce3e24263d702411fd82bcd6ae31c0af6d9
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 10 17:54:28 2009 +0000

    2009-12-10  Patrik Persson  <patrik.j.persson at ericsson.com>
    
            Reviewed by Adam Barth.
    
            Test case to verify that sandboxing 'about:blank' does not make
            the containing frame sandboxed.
    
            https://bugs.webkit.org/show_bug.cgi?id=21288#c28
    
            * fast/frames/resources/sandboxed-iframe-about-blank.html: Added.
            * fast/frames/sandboxed-iframe-about-blank-expected.txt: Added.
            * fast/frames/sandboxed-iframe-about-blank.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b67146..2636bcf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-10  Patrik Persson  <patrik.j.persson at ericsson.com>
+
+        Reviewed by Adam Barth.
+
+        Test case to verify that sandboxing 'about:blank' does not make
+        the containing frame sandboxed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21288#c28
+
+        * fast/frames/resources/sandboxed-iframe-about-blank.html: Added.
+        * fast/frames/sandboxed-iframe-about-blank-expected.txt: Added.
+        * fast/frames/sandboxed-iframe-about-blank.html: Added.
+
 2009-12-10  Eric Z. Ayers  <zundel at google.com>
 
         Reviewed by Pavel Feldman.
diff --git a/LayoutTests/fast/frames/resources/sandboxed-iframe-about-blank.html b/LayoutTests/fast/frames/resources/sandboxed-iframe-about-blank.html
new file mode 100644
index 0000000..8732732
--- /dev/null
+++ b/LayoutTests/fast/frames/resources/sandboxed-iframe-about-blank.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+</head>
+<body>
+    <iframe src="about:blank" sandbox>
+    </iframe>
+    <embed id="plugin" 
+           type="application/x-webkit-test-netscape"
+           src="data:text/plain,"
+           style="width:0; height:0">
+    </embed>
+</body>
+</html>
diff --git a/LayoutTests/fast/frames/sandboxed-iframe-about-blank-expected.txt b/LayoutTests/fast/frames/sandboxed-iframe-about-blank-expected.txt
new file mode 100644
index 0000000..8d2066d
--- /dev/null
+++ b/LayoutTests/fast/frames/sandboxed-iframe-about-blank-expected.txt
@@ -0,0 +1,11 @@
+
+This test verifies that sandboxing 'about:blank' does not make the containing frame sandboxed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS containing frame was able to instantiate plugin
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html b/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html
new file mode 100644
index 0000000..c956b84
--- /dev/null
+++ b/LayoutTests/fast/frames/sandboxed-iframe-about-blank.html
@@ -0,0 +1,36 @@
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+<script src="../js/resources/js-test-post-function.js"></script>
+<script>
+
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+window.onload = function() { 
+    if (self.containing_frame.document.getElementById('plugin').destroyStream)
+        testPassed("containing frame was able to instantiate plugin");
+    else
+        testFailed("containing frame was unable to instantiate plugin");
+
+    isSuccessfullyParsed();
+} 
+
+</script>
+</head>
+<body>
+    <iframe name="containing_frame"
+        src="resources/sandboxed-iframe-about-blank.html">
+    </iframe>
+
+    <p id="description"></p>
+
+    <div id="console"></div>
+
+    <script>
+    description("This test verifies that sandboxing 'about:blank' does not make the containing frame sandboxed.");
+    var successfullyParsed = true;
+    </script>
+</body>
+</html>

-- 
WebKit Debian packaging

