394086 - Stop some special casing for applets in nsDOMClassInfo

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Johnny Stenback (:jst)]

Attachment: Patch to that effect, eliminates nsHTMLAppletElementSH

This is part of bug 393928. Right now we've got a separate scriptable helper for applets, but in a world where the java plugin is scriptable through NPRuntime we need to not only ask for a scriptable applet object through LiveConnect, but also through the normal paths we go through for non-java plugins.

Comment 1

[Johnny Stenback (:jst)]

Attachment: diff -w of the above.

Comment 2

[Christian :Biesinger (don't email me, ping me on IRC)]

+        sNPRuntimeJSClassName = JS_GET_CLASS(cx, plugin_obj)->name;

Since that's really a constant, perhaps plugin should expose that in a header somewhere?

+  nsCOMPtr<nsIPluginInstanceInternal> plugin_internal =
+    do_QueryInterface(pi);
+
+  nsCOMPtr<nsIJVMPluginInstance> javaPluginInstance =
+    do_QueryInterface(pi);

Consistent naming would be nice

Comment 3

[Johnny Stenback (:jst)]

Thanks cbiesinger!

For the record, The line:

+        sNPRuntimeJSClassName = JS_GET_CLASS(cx, plugin_obj)->name;

in nsHTMLPluginObjElementSH::GetPluginJSObject() is missing a '*' before plugin_obj. Last minute goofup...

Comment 4

[Johnny Stenback (:jst)]

Attachment: Patch containing fixes for cbiesingers issues.

Comment 5

[Johnny Stenback (:jst)]

Fix checked in.

Comment 6

[Josh Aas]

mozilla/dom/src/base/nsDOMClassInfo.cpp: In member function 'virtual nsresult nsHTMLPluginObjElementSH::NewResolve(nsIXPConnectWrappedNative*, JSContext*, JSObject*, jsval, PRUint32, JSObject**, PRBool*)':
mozilla/dom/src/base/nsDOMClassInfo.cpp:8987: error: 'nsIJVMPluginInstance' was not declared in this scope
mozilla/dom/src/base/nsDOMClassInfo.cpp:8987: error: template argument 1 is invalid
mozilla/dom/src/base/nsDOMClassInfo.cpp:8987: error: invalid type in declaration before '=' token
mozilla/dom/src/base/nsDOMClassInfo.cpp:8988: error: cannot convert 'nsQueryInterface' to 'int' in initialization

Thunderbird bustage from this patch.

Comment 7

[Johnny Stenback (:jst)]

Attachment: Thunderbird bustage fix.

This is needed for apps that don't define OJI.