mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-14 02:31:59 +00:00
Fixing bug 37763. Making applet elements that are not associated with an Java applet still be scriptable as a normal DOM node. r=pollmann@netscape.com, sr=jband@netscape.com
This commit is contained in:
parent
ba724c809d
commit
ea66f70179
@ -271,7 +271,9 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
void** aScriptObject)
|
void** aScriptObject)
|
||||||
{
|
{
|
||||||
nsresult rv = NS_OK;
|
nsresult rv = NS_OK;
|
||||||
NS_WITH_SERVICE(nsIJVMManager, jvm, nsIJVMManager::GetCID(), &rv);
|
|
||||||
|
nsCOMPtr<nsIJVMManager> jvm(do_GetService(nsIJVMManager::GetCID(), &rv));
|
||||||
|
|
||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
if (!mReflectedApplet) {
|
if (!mReflectedApplet) {
|
||||||
// 0. Make sure the presentation is up-to-date
|
// 0. Make sure the presentation is up-to-date
|
||||||
@ -283,7 +285,7 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
JSObject* elementObject = nsnull;
|
JSObject* elementObject = nsnull;
|
||||||
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
||||||
(void**)&elementObject);
|
(void**)&elementObject);
|
||||||
if (NS_OK != rv)
|
if (NS_FAILED(rv))
|
||||||
return rv;
|
return rv;
|
||||||
|
|
||||||
// 2. get the plugin instance corresponding to this element.
|
// 2. get the plugin instance corresponding to this element.
|
||||||
@ -312,10 +314,9 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
JSObject* wrappedAppletObject = nsnull;
|
JSObject* wrappedAppletObject = nsnull;
|
||||||
nsCOMPtr<nsIPluginInstance> pluginInstance;
|
nsCOMPtr<nsIPluginInstance> pluginInstance;
|
||||||
|
|
||||||
rv = NS_GetObjectFramePluginInstance(frame,
|
NS_GetObjectFramePluginInstance(frame, *getter_AddRefs(pluginInstance));
|
||||||
*getter_AddRefs(pluginInstance));
|
|
||||||
|
|
||||||
if ((rv == NS_OK) && (nsnull != pluginInstance)) {
|
if (pluginInstance) {
|
||||||
nsCOMPtr<nsIJVMPluginInstance> javaPluginInstance;
|
nsCOMPtr<nsIJVMPluginInstance> javaPluginInstance;
|
||||||
|
|
||||||
javaPluginInstance = do_QueryInterface(pluginInstance);
|
javaPluginInstance = do_QueryInterface(pluginInstance);
|
||||||
@ -323,7 +324,8 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
if (javaPluginInstance) {
|
if (javaPluginInstance) {
|
||||||
jobject appletObject = nsnull;
|
jobject appletObject = nsnull;
|
||||||
rv = javaPluginInstance->GetJavaObject(&appletObject);
|
rv = javaPluginInstance->GetJavaObject(&appletObject);
|
||||||
if (NS_OK == rv) {
|
|
||||||
|
if (NS_SUCCEEDED(rv)) {
|
||||||
nsCOMPtr<nsILiveConnectManager> manager;
|
nsCOMPtr<nsILiveConnectManager> manager;
|
||||||
|
|
||||||
manager = do_GetService(nsIJVMManager::GetCID());
|
manager = do_GetService(nsIJVMManager::GetCID());
|
||||||
@ -338,12 +340,21 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
|
|
||||||
// 4. set the __proto__ field of the applet object to be the
|
// 4. set the __proto__ field of the applet object to be the
|
||||||
// element script object.
|
// element script object.
|
||||||
if (nsnull != wrappedAppletObject) {
|
if (wrappedAppletObject) {
|
||||||
JS_SetPrototype(context, wrappedAppletObject, elementObject);
|
JS_SetPrototype(context, wrappedAppletObject, elementObject);
|
||||||
|
|
||||||
|
// Cache the wrapped applet object as our script object.
|
||||||
SetScriptObject(wrappedAppletObject);
|
SetScriptObject(wrappedAppletObject);
|
||||||
|
|
||||||
mReflectedApplet = PR_TRUE;
|
mReflectedApplet = PR_TRUE;
|
||||||
}
|
|
||||||
*aScriptObject = wrappedAppletObject;
|
*aScriptObject = wrappedAppletObject;
|
||||||
|
} else {
|
||||||
|
// We didn't wrap the applet object so we'll fall back and use
|
||||||
|
// the plain DOM script object.
|
||||||
|
|
||||||
|
*aScriptObject = elementObject;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
||||||
|
@ -271,7 +271,9 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
void** aScriptObject)
|
void** aScriptObject)
|
||||||
{
|
{
|
||||||
nsresult rv = NS_OK;
|
nsresult rv = NS_OK;
|
||||||
NS_WITH_SERVICE(nsIJVMManager, jvm, nsIJVMManager::GetCID(), &rv);
|
|
||||||
|
nsCOMPtr<nsIJVMManager> jvm(do_GetService(nsIJVMManager::GetCID(), &rv));
|
||||||
|
|
||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
if (!mReflectedApplet) {
|
if (!mReflectedApplet) {
|
||||||
// 0. Make sure the presentation is up-to-date
|
// 0. Make sure the presentation is up-to-date
|
||||||
@ -283,7 +285,7 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
JSObject* elementObject = nsnull;
|
JSObject* elementObject = nsnull;
|
||||||
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
||||||
(void**)&elementObject);
|
(void**)&elementObject);
|
||||||
if (NS_OK != rv)
|
if (NS_FAILED(rv))
|
||||||
return rv;
|
return rv;
|
||||||
|
|
||||||
// 2. get the plugin instance corresponding to this element.
|
// 2. get the plugin instance corresponding to this element.
|
||||||
@ -312,10 +314,9 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
JSObject* wrappedAppletObject = nsnull;
|
JSObject* wrappedAppletObject = nsnull;
|
||||||
nsCOMPtr<nsIPluginInstance> pluginInstance;
|
nsCOMPtr<nsIPluginInstance> pluginInstance;
|
||||||
|
|
||||||
rv = NS_GetObjectFramePluginInstance(frame,
|
NS_GetObjectFramePluginInstance(frame, *getter_AddRefs(pluginInstance));
|
||||||
*getter_AddRefs(pluginInstance));
|
|
||||||
|
|
||||||
if ((rv == NS_OK) && (nsnull != pluginInstance)) {
|
if (pluginInstance) {
|
||||||
nsCOMPtr<nsIJVMPluginInstance> javaPluginInstance;
|
nsCOMPtr<nsIJVMPluginInstance> javaPluginInstance;
|
||||||
|
|
||||||
javaPluginInstance = do_QueryInterface(pluginInstance);
|
javaPluginInstance = do_QueryInterface(pluginInstance);
|
||||||
@ -323,7 +324,8 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
if (javaPluginInstance) {
|
if (javaPluginInstance) {
|
||||||
jobject appletObject = nsnull;
|
jobject appletObject = nsnull;
|
||||||
rv = javaPluginInstance->GetJavaObject(&appletObject);
|
rv = javaPluginInstance->GetJavaObject(&appletObject);
|
||||||
if (NS_OK == rv) {
|
|
||||||
|
if (NS_SUCCEEDED(rv)) {
|
||||||
nsCOMPtr<nsILiveConnectManager> manager;
|
nsCOMPtr<nsILiveConnectManager> manager;
|
||||||
|
|
||||||
manager = do_GetService(nsIJVMManager::GetCID());
|
manager = do_GetService(nsIJVMManager::GetCID());
|
||||||
@ -338,12 +340,21 @@ nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
|
|||||||
|
|
||||||
// 4. set the __proto__ field of the applet object to be the
|
// 4. set the __proto__ field of the applet object to be the
|
||||||
// element script object.
|
// element script object.
|
||||||
if (nsnull != wrappedAppletObject) {
|
if (wrappedAppletObject) {
|
||||||
JS_SetPrototype(context, wrappedAppletObject, elementObject);
|
JS_SetPrototype(context, wrappedAppletObject, elementObject);
|
||||||
|
|
||||||
|
// Cache the wrapped applet object as our script object.
|
||||||
SetScriptObject(wrappedAppletObject);
|
SetScriptObject(wrappedAppletObject);
|
||||||
|
|
||||||
mReflectedApplet = PR_TRUE;
|
mReflectedApplet = PR_TRUE;
|
||||||
}
|
|
||||||
*aScriptObject = wrappedAppletObject;
|
*aScriptObject = wrappedAppletObject;
|
||||||
|
} else {
|
||||||
|
// We didn't wrap the applet object so we'll fall back and use
|
||||||
|
// the plain DOM script object.
|
||||||
|
|
||||||
|
*aScriptObject = elementObject;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
rv = nsGenericHTMLContainerElement::GetScriptObject(aContext,
|
||||||
|
Loading…
Reference in New Issue
Block a user