[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aestes at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 05a1f886b1db89d285bae0c04d1f81ec95af0310
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 21:01:44 2010 +0000

    Add the tests for r70332.
    https://bugs.webkit.org/show_bug.cgi?id=48046
    
    Reviewed by Eric Carlson.
    
    * plugins/invalid-mime-with-valid-extension-shows-missing-plugin-expected.txt: Added.
    * plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 25fb9a1..53a6705 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,12 +2,20 @@
 
         Reviewed by Eric Carlson.
 
-        WebKit shouldn't load a plug-in based on file extension if a MIME type
-        is specified.
+        Add the tests for r70332.
         https://bugs.webkit.org/show_bug.cgi?id=48046
 
         * plugins/invalid-mime-with-valid-extension-shows-missing-plugin-expected.txt: Added.
         * plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html: Added.
+
+2010-10-22  Andy Estes  <aestes at apple.com>
+
+        Reviewed by Eric Carlson.
+
+        WebKit shouldn't load a plug-in based on file extension if a MIME type
+        is specified.
+        https://bugs.webkit.org/show_bug.cgi?id=48046
+
         * plugins/resources/test.testnetscape: Added.
 
 2010-10-22  Adam Barth  <abarth at webkit.org>
diff --git a/LayoutTests/fast/dom/beforeload/image-object-before-load-expected.txt b/LayoutTests/plugins/invalid-mime-with-valid-extension-shows-missing-plugin-expected.txt
similarity index 100%
copy from LayoutTests/fast/dom/beforeload/image-object-before-load-expected.txt
copy to LayoutTests/plugins/invalid-mime-with-valid-extension-shows-missing-plugin-expected.txt
diff --git a/LayoutTests/plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html b/LayoutTests/plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html
new file mode 100644
index 0000000..f2a8006
--- /dev/null
+++ b/LayoutTests/plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html
@@ -0,0 +1,22 @@
+<script>
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+        layoutTestController.waitUntilDone();
+    }
+
+    function logFailure() {
+        document.getElementById("console").innerHTML = "FAIL";
+    }
+
+    function finishTest() {
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    }
+</script>
+<div id="console">PASS</div>
+<embed name="plugin" src="resources/test.testnetscape" type="application/x-non-existent">
+<script>
+    if (plugin.testCallback)
+        plugin.testCallback("logFailure");
+    finishTest();
+</script>

-- 
WebKit Debian packaging