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

Thu Apr 8 00:46:47 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit ab751138a3e2cf0f76202f784ce1d0653d1bf724
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 23:50:05 2009 +0000

    2009-12-22  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Upstream platform-specific variant of
            plugins/get-url-with-blank-target.html . There is some uncertainty
            over which behavior is correct - Chromium's and Safari/Win in this
            test, or Safari/Mac in the generic test. See
            https://bugs.webkit.org/show_bug.cgi?id=32886 for the bug to converge
            the two.
            This patch is bug https://bugs.webkit.org/show_bug.cgi?32762 .
    
            * platform/chromium/plugins/get-url-with-blank-target-expected.txt: Added.
            * platform/chromium/plugins/get-url-with-blank-target.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52506 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0c8cc88..4396e65 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Eric Seidel.
 
+        Upstream platform-specific variant of
+        plugins/get-url-with-blank-target.html . There is some uncertainty
+        over which behavior is correct - Chromium's and Safari/Win in this
+        test, or Safari/Mac in the generic test. See 
+        https://bugs.webkit.org/show_bug.cgi?id=32886 for the bug to converge
+        the two.
+        This patch is bug https://bugs.webkit.org/show_bug.cgi?32762 .
+
+        * platform/chromium/plugins/get-url-with-blank-target-expected.txt: Added.
+        * platform/chromium/plugins/get-url-with-blank-target.html: Added.
+
+2009-12-22  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Eric Seidel.
+
         Upstream a bunch of forms tests from chromium.org.
         https://bugs.webkit.org/show_bug.cgi?id=32755
 
diff --git a/LayoutTests/plugins/get-url-with-blank-target-expected.txt b/LayoutTests/platform/chromium/plugins/get-url-with-blank-target-expected.txt
similarity index 100%
copy from LayoutTests/plugins/get-url-with-blank-target-expected.txt
copy to LayoutTests/platform/chromium/plugins/get-url-with-blank-target-expected.txt
diff --git a/LayoutTests/platform/chromium/plugins/get-url-with-blank-target.html b/LayoutTests/platform/chromium/plugins/get-url-with-blank-target.html
new file mode 100644
index 0000000..6e69390
--- /dev/null
+++ b/LayoutTests/platform/chromium/plugins/get-url-with-blank-target.html
@@ -0,0 +1,36 @@
+<html>
+<script>
+var NPERR_NO_ERROR = 0;
+var NPERR_GENERIC_ERROR = 1;
+
+function callback(result) {
+    var d = document.getElementById('result');
+
+    if (result == NPERR_NO_ERROR)
+        d.innerHTML = "SUCCESS"
+    else
+        d.innerHTML = "FAILED - got error code " + result
+
+    layoutTestController.notifyDone();
+}
+
+function runtest() {
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+        layoutTestController.waitUntilDone();
+        layoutTestController.setCanOpenWindows();
+        // The new window should close immediately after it opens and finishes
+        // loading.  The setTimeout allows NPP_URLNotify to run before the
+        // window is closed.
+        plg.getURLNotify("data:text/html,<body onload='setTimeout(function(){close()},0)'></body>", "_blank", "callback");
+    } else {
+        document.write("Cannot run interactively");
+    }
+}
+</script>
+<body onload="runtest()">
+<embed id="plg" type="application/x-webkit-test-netscape"></embed>
+This tests that we won't crash when a plugin tries to open an URL in a new window when the application does not create the window. If this test is successful, the word SUCCESS should be seen below.
+<div id="result">FAILED</div>
+</body>
+</html>

-- 
WebKit Debian packaging

