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

Wed Dec 22 13:41:42 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit fdafe2b269031bf58d8ef3506bea981a14c3d8c2
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 17:29:05 2010 +0000

            Reviewed by Anders Carlsson.
    
            https://bugs.webkit.org/show_bug.cgi?id=43667
            ASSERT failure in NetscapePluginInstanceProxy::disconnectStream
    
            Test: plugins/get-javascript-url.html
    
            * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
            (WebKit::NetscapePluginInstanceProxy::evaluateJavaScript): Add the stream to m_streams, just
            like any other one.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8053e61..4936146 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-22  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43667
+        ASSERT failure in NetscapePluginInstanceProxy::disconnectStream
+
+        * plugins/get-javascript-url-expected.txt: Added.
+        * plugins/get-javascript-url.html: Added.
+
 2010-09-23  Abhishek Arya  <inferno at chromium.org>
 
         Reviewed by Dave Hyatt.
diff --git a/LayoutTests/plugins/get-javascript-url-expected.txt b/LayoutTests/plugins/get-javascript-url-expected.txt
new file mode 100644
index 0000000..9f6624d
--- /dev/null
+++ b/LayoutTests/plugins/get-javascript-url-expected.txt
@@ -0,0 +1,4 @@
+Test that loading a javascript URL works correctly.
+
+
+PASS, no assertion failure.
diff --git a/LayoutTests/plugins/get-javascript-url.html b/LayoutTests/plugins/get-javascript-url.html
new file mode 100644
index 0000000..0840e95
--- /dev/null
+++ b/LayoutTests/plugins/get-javascript-url.html
@@ -0,0 +1,21 @@
+<body>
+<p>Test that loading a javascript URL works correctly.</p>
+<embed type="application/x-webkit-test-netscape" id="testPlugin" onURLNotify="done()">
+<div id="result">Testing...</div>
+<script>
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+function done()
+{
+    document.getElementById("result").innerHTML = "PASS, no assertion failure.";
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+
+var testPlugin = document.getElementById('testPlugin');
+testPlugin.getURLNotify("javascript:12345", null, "callback");
+</script>
+</body>
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d95b4d0..72a84c0 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-22  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43667
+        ASSERT failure in NetscapePluginInstanceProxy::disconnectStream
+
+        Test: plugins/get-javascript-url.html
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::evaluateJavaScript): Add the stream to m_streams, just
+        like any other one.
+
 2010-09-21  Darin Adler  <darin at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index c0c480b..e03bc27 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -704,6 +704,7 @@ void NetscapePluginInstanceProxy::evaluateJavaScript(PluginRequest* pluginReques
         NSData *JSData = [result dataUsingEncoding:NSUTF8StringEncoding];
         
         RefPtr<HostedNetscapePluginStream> stream = HostedNetscapePluginStream::create(this, pluginRequest->requestID(), pluginRequest->request());
+        m_streams.add(stream->streamID(), stream);
         
         RetainPtr<NSURLResponse> response(AdoptNS, [[NSURLResponse alloc] initWithURL:URL 
                                                                              MIMEType:@"text/plain" 

-- 
WebKit Debian packaging

