Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for bug 125278 and bug 138606. Do not force plugin draw when already drawing and fix backwards compatibility issues to Netscape 6.x. r=sdagley, sr=beard on both patches.

Browse Source
This commit is contained in:
bnesse%netscape.com 2002-04-24 20:09:21 +00:00
parent db55935a5f
commit 5d07a9a042
3 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
View File

@ -63,7 +63,6 @@
#include "netscape_javascript_JSObject.h" /* javah-generated headers */
extern nsIPluginManager* thePluginManager;
extern nsIServiceManager* theServiceManager; // needs to be in badaptor.cpp.
static MRJPlugin* theJVMPlugin = NULL;
static nsILiveconnect* theLiveConnectManager = NULL;
@ -84,8 +83,7 @@ static NS_DEFINE_IID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static nsresult getGlobalComponentManager(nsIComponentManagerObsolete* *result)
{
return theServiceManager->GetService(kComponentManagerCID, NS_GET_IID(nsIComponentManagerObsolete),
(void**)result);
return MRJPlugin::GetService(kComponentManagerCID, NS_GET_IID(nsIComponentManagerObsolete), (void**)result);
}
nsresult InitLiveConnectSupport(MRJPlugin* jvmPlugin)
@ -94,7 +92,7 @@ nsresult InitLiveConnectSupport(MRJPlugin* jvmPlugin)
getGlobalComponentManager(&theComponentManager);
nsresult result = theServiceManager->GetService(kLiveConnectCID, NS_GET_IID(nsILiveconnect),
nsresult result = MRJPlugin::GetService(kLiveConnectCID, NS_GET_IID(nsILiveconnect),
(void**)&theLiveConnectManager);
if (result != NS_OK)
return result;
@ -343,7 +341,7 @@ void MessageRunnable::execute(JNIEnv* env)
// because a spontaneous Java thread called us, we have to switch to the JavaScript thread
// to handle this request.
nsIThreadManager* threadManager = NULL;
if (theServiceManager->GetService(nsIJVMManager::GetCID(), NS_GET_IID(nsIThreadManager), (void **)&threadManager) == NS_OK) {
if (MRJPlugin::GetService(nsIJVMManager::GetCID(), NS_GET_IID(nsIThreadManager), (void **)&threadManager) == NS_OK) {
threadManager->PostEvent(mThreadID, this, PR_FALSE);
NS_RELEASE(threadManager);
}
@ -352,7 +350,7 @@ void MessageRunnable::execute(JNIEnv* env)
NS_IMETHODIMP MessageRunnable::Run()
{
nsIJVMManager* javaManager = NULL;
if (theServiceManager->GetService(nsIJVMManager::GetCID(), NS_GET_IID(nsIJVMManager), (void **)&javaManager) == NS_OK) {
if (MRJPlugin::GetService(nsIJVMManager::GetCID(), NS_GET_IID(nsIJVMManager), (void **)&javaManager) == NS_OK) {
JNIEnv* proxyEnv = NULL;
if (javaManager->GetProxyJNI(&proxyEnv) == NS_OK && proxyEnv != NULL)
mMessage->execute(proxyEnv);

50
plugin/oji/MRJ/plugin/Source/MRJPlugin.cpp
View File

@ -64,7 +64,8 @@
#include <Resources.h>
nsIServiceManager* theServiceManager = NULL;
static nsIServiceManager* theServiceManager = NULL;
static nsIServiceManagerObsolete* theServiceManagerObsolete = NULL;
extern nsIServiceManager* theServiceManager; // needs to be in badaptor.cpp.
extern nsIPluginManager* thePluginManager; // now in badaptor.cpp.
@ -80,7 +81,9 @@ short thePluginRefnum = -1;
static NS_DEFINE_IID(kPluginCID, NS_PLUGIN_CID);
static NS_DEFINE_IID(kPluginManagerCID, NS_PLUGINMANAGER_CID);
#ifdef MRJPLUGIN_4X
static NS_DEFINE_IID(kMemoryCID, NS_MEMORY_CID);
#endif
static NS_DEFINE_IID(kJVMManagerCID, NS_JVMMANAGER_CID);
static NS_DEFINE_IID(kIWindowlessPluginInstancePeerIID, NS_IWINDOWLESSPLUGININSTANCEPEER_IID);
@ -88,20 +91,44 @@ static NS_DEFINE_IID(kIWindowlessPluginInstancePeerIID, NS_IWINDOWLESSPLUGININST
const char* MRJPlugin::PLUGIN_VERSION = "eerieQuarkDoll.v.b1";
nsresult MRJPlugin::GetService(const nsCID& aCID, const nsIID& aIID, void* *aService)
{
if (theServiceManager)
return theServiceManager->GetService(aCID, aIID, aService);
if (theServiceManagerObsolete)
return theServiceManagerObsolete->GetService(aCID, aIID, (nsISupports **)aService);
return NS_ERROR_FAILURE;
}
nsresult MRJPlugin::GetService(const char* aContractID, const nsIID& aIID, void* *aService)
{
if (theServiceManager)
return theServiceManager->GetServiceByContractID(aContractID, aIID, aService);
if (theServiceManagerObsolete)
return theServiceManagerObsolete->GetService(aContractID, aIID, (nsISupports **)aService);
return NS_ERROR_FAILURE;
}
#pragma export on
nsresult NSGetFactory(nsISupports* serviceManager, const nsCID &aClass, const char *aClassName, const char *aContractID, nsIFactory **aFactory)
{
nsresult result = NS_OK;
if (theServiceManager == NULL) {
if (serviceManager->QueryInterface(NS_GET_IID(nsIServiceManager), (void **)&theServiceManager) != NS_OK)
return NS_ERROR_FAILURE;
if (theServiceManager == NULL && theServiceManagerObsolete == NULL) {
if (NS_FAILED(serviceManager->QueryInterface(NS_GET_IID(nsIServiceManager), (void**)&theServiceManager)))
if (NS_FAILED(serviceManager->QueryInterface(NS_GET_IID(nsIServiceManagerObsolete), (void**)&theServiceManagerObsolete)))
return NS_ERROR_FAILURE;
// Our global operator new wants to use nsIMalloc to do all of its allocation.
// This should be available from the Service Manager.
if (theServiceManager->GetService(kMemoryCID, NS_GET_IID(nsIMemory), (void**)&theMemoryAllocator) != NS_OK)
#ifdef MRJPLUGIN_4X
if (MRJPlugin::GetService(kMemoryCID, NS_GET_IID(nsIMemory), (void**)&theMemoryAllocator) != NS_OK)
return NS_ERROR_FAILURE;
#else
if (NS_FAILED(MRJPlugin::GetService("@mozilla.org/xpcom/memory-service;1", NS_GET_IID(nsIMemory), (void **)&theMemoryAllocator)))
return NS_ERROR_FAILURE;
#endif
}
if (aClass.Equals(kPluginCID)) {
@ -268,7 +295,7 @@ NS_METHOD MRJPlugin::Initialize()
// try to get a plugin manager.
if (thePluginManager == NULL) {
result = theServiceManager->GetService(kPluginManagerCID, NS_GET_IID(nsIPluginManager), (void**)&thePluginManager);
result = MRJPlugin::GetService(kPluginManagerCID, NS_GET_IID(nsIPluginManager), (void**)&thePluginManager);
if (result != NS_OK || thePluginManager == NULL)
return NS_ERROR_FAILURE;
}
@ -280,7 +307,7 @@ NS_METHOD MRJPlugin::Initialize()
}
// try to get a JVM manager. we have to be able to run without one.
if (theServiceManager->GetService(kJVMManagerCID, NS_GET_IID(nsIJVMManager), (void**)&mManager) != NS_OK)
if (MRJPlugin::GetService(kJVMManagerCID, NS_GET_IID(nsIJVMManager), (void**)&mManager) != NS_OK)
mManager = NULL;
// try to get a Thread manager.
@ -312,6 +339,7 @@ NS_METHOD MRJPlugin::Shutdown()
// release our reference to the service manager.
NS_IF_RELEASE(theServiceManager);
NS_IF_RELEASE(theServiceManagerObsolete);
return NS_OK;
}
@ -764,6 +792,7 @@ NS_METHOD MRJPluginInstance::SetWindow(nsPluginWindow* pluginWindow)
NS_METHOD MRJPluginInstance::HandleEvent(nsPluginEvent* pluginEvent, PRBool* eventHandled)
{
*eventHandled = PR_TRUE;
Boolean isUpdate;
if (pluginEvent != NULL) {
EventRecord* event = pluginEvent->event;
@ -776,7 +805,8 @@ NS_METHOD MRJPluginInstance::HandleEvent(nsPluginEvent* pluginEvent, PRBool* eve
}
#else
// Check for coordinate/clipping changes.
inspectInstance();
isUpdate = (event->what == updateEvt);
inspectInstance(isUpdate);
#endif
if (event->what == nullEvent) {
@ -904,8 +934,8 @@ MRJSession* MRJPluginInstance::getSession()
return mSession;
}
void MRJPluginInstance::inspectInstance()
void MRJPluginInstance::inspectInstance(Boolean isUpdateEvt)
{
if (mContext != NULL && mContext->inspectWindow() && mWindowlessPeer != NULL)
if (mContext != NULL && mContext->inspectWindow() && !isUpdateEvt && mWindowlessPeer != NULL)
mWindowlessPeer->ForceRedraw();
}

5
plugin/oji/MRJ/plugin/Source/MRJPlugin.h
View File

@ -68,6 +68,9 @@ public:
MRJPlugin();
virtual ~MRJPlugin();
static nsresult GetService(const nsCID &aCID, const nsIID& aIID, void* *aService);
static nsresult GetService(const char* aContractID, const nsIID& aIID, void* *aService);
static const char* PLUGIN_VERSION;
// Currently, this is a singleton, statically allocated object.
@ -468,7 +471,7 @@ public:
private:
void pushInstance(void);
void popInstance(void);
void inspectInstance(void);
void inspectInstance(Boolean isUpdateEvt);
private:
nsIPluginInstancePeer* mPeer;