java/java-and-plugins.html test failing
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Mar 2012 04:39:37 +0000 (04:39 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Mar 2012 04:39:37 +0000 (04:39 +0000)
commitb12ff01b0368bf5d6b84bb5d68608601c7a7a771
tree8d1e5596c3b5a5dd11aae571b1e4337be79804d0
parenta4d013190f08b8248338b00a97e5bb5831acc1d3
java/java-and-plugins.html test failing
https://bugs.webkit.org/show_bug.cgi?id=81188
<rdar://problem/11048657>

Reviewed by Sam Weinig.

Source/WebKit/mac:

When we're marshaling JSObjects that wrap plug-in objects, make sure to check that the
current plug-in instance is the same as the plug-in instance the object came from and don't
pass the unwrapped object ID if that is the case.

* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::getObjectID):
(WebKit::NetscapePluginInstanceProxy::addValueToArray):
(WebKit::NetscapePluginInstanceProxy::marshalValues):
* Plugins/Hosted/ProxyInstance.h:
(ProxyInstance):
(WebKit::ProxyInstance::instanceProxy):

Source/WebKit2:

When we're marshaling NPObjects that wrap plug-in objects, make sure to check that the
current plug-in instance is the same as the plug-in instance the object came from and don't
pass the unwrapped object ID if that is the case.

* Shared/Plugins/NPRemoteObjectMap.cpp:
(WebKit::remoteNPObjectID):
(WebKit::NPRemoteObjectMap::npVariantToNPVariantData):

LayoutTests:

Remove part of this test that tested trying to call a java method on an NPObject; on Snow Leopard
and newer the Java plug-in is also a NPAPI plug-in so the two removed tests would fail.

* java/java-and-plugins-expected.txt:
* java/java-and-plugins.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110820 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/java/java-and-plugins-expected.txt
LayoutTests/java/java-and-plugins.html
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp