Changes to bring plugin code inline with various superclass changes and environment changes causal

plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp

@@ -655,6 +655,19 @@ public:
     NS_IMETHOD
     GetAttribute(const char* name, const char* *result);
 
+    /**
+     * Returns the DOM element corresponding to the tag which references
+     * this plugin in the document.
+     *
+     * REMIND: do we need to expose as an nsISupports * to avoid
+     * introducing runtime dependencies on XPCOM?
+     *
+     * @param result - resulting DOM element
+     * @result - NS_OK if this operation was successful
+     */
+    NS_IMETHOD
+    GetDOMElement(nsIDOMElement* *result);
+
 	/**
 	 * Returns a JRI env corresponding to the current Java thread of the
 	 * browser.
@@ -1145,8 +1158,10 @@ NPP_New(NPMIMEType pluginType,
     // XXX - Since np_instance is not implemented in the 4.0x browser, I
     // XXX - had to save the plugin parameter in the peer class.
     // XXX - Ask Warren about np_instance.
-    CPluginInstancePeer* peer = new CPluginInstancePeer(pluginInstance, instance, (nsMIMEType)pluginType, 
-						                                (nsPluginMode)mode, (PRUint16)argc, (const char** )argn, (const char** )argv);
+    CPluginInstancePeer* peer = new CPluginInstancePeer(pluginInstance, instance,
+    													(nsMIMEType)pluginType, 
+						                                (nsPluginMode)mode, (PRUint16)argc,
+						                                (const char** )argn, (const char** )argv);
     assert( peer != NULL );
     if (!peer) return NPERR_OUT_OF_MEMORY_ERROR;
     peer->AddRef();
@@ -2180,6 +2195,24 @@ CPluginInstancePeer::GetAttribute(const char* name, const char* *result)
     return NS_ERROR_FAILURE;
 }
 
+/**
+ * Returns the DOM element corresponding to the tag which references
+ * this plugin in the document.
+ *
+ * REMIND: do we need to expose as an nsISupports * to avoid
+ * introducing runtime dependencies on XPCOM?
+ *
+ * @param result - resulting DOM element
+ * @result - NS_OK if this operation was successful
+ */
+NS_METHOD
+CPluginInstancePeer::GetDOMElement(nsIDOMElement* *result)
+{
+/** PENDING **/
+
+	return NS_OK;
+}
+
 //+++++++++++++++++++++++++++++++++++++++++++++++++
 // NewStream:
 //+++++++++++++++++++++++++++++++++++++++++++++++++

plugin/oji/MRJ/plugin/Source/JSEvaluator.h

@@ -28,7 +28,7 @@
 #include "nsIPluginStreamListener.h"
 
 #ifndef JNI_H
-#include <jni.h>
+#include "jni.h"
 #endif
 
 class MRJMonitor;

plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.h

@@ -27,7 +27,7 @@
 
 #include "nsError.h"
 
-#include <jni.h>
+#include "jni.h"
 
 class MRJPlugin;
 

plugin/oji/MRJ/plugin/Source/MRJConsole.h

@@ -31,7 +31,7 @@
 #include "nsIEventHandler.h"
 #include "SupportsMixin.h"
 
-#include <jni.h>
+#include "jni.h"
 #include <JManager.h>
 
 class MRJPlugin;

plugin/oji/MRJ/plugin/Source/MRJMonitor.h

@@ -30,7 +30,7 @@
 #include "Monitor.h"
 
 #ifndef JNI_H
-#include <jni.h>
+#include "jni.h"
 #endif
 
 class MRJSession;

plugin/oji/MRJ/plugin/Source/MRJPlugin.cpp

@@ -503,13 +503,17 @@ MRJPluginInstance* MRJPlugin::getPluginInstance(JNIEnv* jenv)
 
 Boolean MRJPlugin::inPluginThread()
 {
-        Boolean result = false;
-	nsPluginThread *currentThreadID = -1;
+	Boolean result = false;
+	nsPluginThread *currentThreadID = NULL;
+	
 	if (mThreadManager != NULL)
 		mThreadManager->GetCurrentThread(&currentThreadID);
 	if ((NULL != currentThreadID) && (NULL != mPluginThreadID)) {
-	  result = (*mPluginThreadID == *currentThreadID);
+		if (currentThreadID == mPluginThreadID) {
+			result = true;
+		}
 	}
+	
 	return result;
 }