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

Tue Jan 5 23:56:16 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit c7a572a65ddc6b330da97800fb151d88c5d461e0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 10:27:34 2009 +0000

    2009-12-20  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Darin Adler.
    
            Upstreaming two plugin tests from chromium.org.
            https://bugs.webkit.org/show_bug.cgi?id=32750
    
            * plugins/get-file-url-expected.txt: Added.
            * plugins/get-file-url.html: Added.
            * plugins/get-url-with-iframe-target-expected.txt: Added.
            * plugins/get-url-with-iframe-target.html: Added.
            * plugins/resources/get-file-url-subframe.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52410 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 764c85a..c456b44 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Darin Adler.
 
+        Upstreaming two plugin tests from chromium.org.
+        https://bugs.webkit.org/show_bug.cgi?id=32750
+
+        * plugins/get-file-url-expected.txt: Added.
+        * plugins/get-file-url.html: Added.
+        * plugins/get-url-with-iframe-target-expected.txt: Added.
+        * plugins/get-url-with-iframe-target.html: Added.
+        * plugins/resources/get-file-url-subframe.html: Added.
+
+2009-12-20  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Darin Adler.
+
         Upstream a test from chromium.org that verifies that calling
         document.clear() from an external script doesn't crash the browser.
         https://bugs.webkit.org/show_bug.cgi?id=32743
diff --git a/LayoutTests/plugins/get-file-url-expected.txt b/LayoutTests/plugins/get-file-url-expected.txt
new file mode 100644
index 0000000..6cb6a2d
--- /dev/null
+++ b/LayoutTests/plugins/get-file-url-expected.txt
@@ -0,0 +1,5 @@
+
+This tests that file URLs can embed plugins which can successfully load other File URLs from the Plugin. (Via the NPN_GetURL API)
+
+SUCCESS
+
diff --git a/LayoutTests/plugins/get-file-url.html b/LayoutTests/plugins/get-file-url.html
new file mode 100644
index 0000000..f5f03e1
--- /dev/null
+++ b/LayoutTests/plugins/get-file-url.html
@@ -0,0 +1,41 @@
+<html>
+<body>
+<embed id="plg" type="application/x-webkit-test-netscape"></embed><P>
+
+This tests that file URLs can embed plugins which can successfully
+load other File URLs from the Plugin.  (Via the NPN_GetURL API)
+
+<div id="result">FAILED</div>
+<iframe name="output">Output Goes Here</iframe>
+
+<script>
+function CheckForFinished() {
+  if (window.subframe_done == 1) {
+    var result = document.getElementById("result");
+    result.innerHTML = "SUCCESS";
+    if (layoutTestController) {
+      layoutTestController.notifyDone();
+    }
+  } else {
+    setTimeout(CheckForFinished, 10);
+  }
+}
+
+function runtest() {
+  window.subframe_done = 0;
+  var loc = window.location.toString();
+  var subfile = loc.replace(/get-file-url.html/,"resources/get-file-url-subframe.html");
+  var plg = document.getElementById("plg");
+  plg.getURL(subfile, "output");
+  setTimeout(CheckForFinished, 10);
+}
+
+if (layoutTestController) {
+  layoutTestController.dumpAsText();
+  layoutTestController.waitUntilDone();
+}
+runtest();
+</script>
+</body>
+</html>
+
diff --git a/LayoutTests/plugins/get-url-with-iframe-target-expected.txt b/LayoutTests/plugins/get-url-with-iframe-target-expected.txt
new file mode 100644
index 0000000..2499c66
--- /dev/null
+++ b/LayoutTests/plugins/get-url-with-iframe-target-expected.txt
@@ -0,0 +1,3 @@
+ This tests that the plugin properly receives NPP_URLNotify for subframe loads.
+SUCCESS
+
diff --git a/LayoutTests/plugins/get-url-with-iframe-target.html b/LayoutTests/plugins/get-url-with-iframe-target.html
new file mode 100644
index 0000000..b984540
--- /dev/null
+++ b/LayoutTests/plugins/get-url-with-iframe-target.html
@@ -0,0 +1,33 @@
+<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();
+        plg.getURLNotify("data:,hello world", "frame", "callback");
+    } else {
+        document.write("Cannot run interactively");
+    }
+}
+</script>
+<body onload="runtest()">
+<embed id="plg" type="application/x-webkit-test-netscape"></embed>
+This tests that the plugin properly receives NPP_URLNotify for subframe loads.
+<div id="result">FAILED</div>
+<iframe id="frame"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/plugins/resources/get-file-url-subframe.html b/LayoutTests/plugins/resources/get-file-url-subframe.html
new file mode 100644
index 0000000..b344691
--- /dev/null
+++ b/LayoutTests/plugins/resources/get-file-url-subframe.html
@@ -0,0 +1,10 @@
+<html>
+<body>
+Subframe loaded.
+
+<script>
+window.parent.subframe_done = 1;
+</script>
+
+</body>
+</html>

-- 
WebKit Debian packaging

