зеркало из https://github.com/mozilla/gecko-dev.git
fix pluginClassic bustage, r=peterl, sr=sfraser
This commit is contained in:
Родитель
ee82bc4072
Коммит
bb3e627517
|
@ -25,3 +25,5 @@
|
|||
#include "MacSharedPrefix_debug.h"
|
||||
|
||||
#undef TARGET_CARBON
|
||||
#define TARGET_CARBON 0
|
||||
#define PLUGIN_LOGGING 0
|
||||
|
|
|
@ -23,3 +23,7 @@
|
|||
#define _IMPL_NS_PLUGINS 1
|
||||
|
||||
#include "MacSharedPrefix.h"
|
||||
|
||||
#undef TARGET_CARBON
|
||||
#define TARGET_CARBON 0
|
||||
#define PLUGIN_LOGGING 0
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
#define NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID "@mozilla.org/plugin/classicpluginfactory;1"
|
||||
|
||||
struct PRLibrary;
|
||||
class nsIServiceManagerObsolete;
|
||||
|
||||
class nsIClassicPluginFactory : public nsISupports {
|
||||
public:
|
||||
|
@ -63,7 +64,7 @@ public:
|
|||
* and initializes an ns4xPlugin object, and returns it in
|
||||
* <b>result</b>.
|
||||
*/
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
|
||||
PRLibrary* aLibrary, nsIPlugin** aResult) = 0;
|
||||
};
|
||||
|
||||
|
|
|
@ -43,7 +43,9 @@
|
|||
#ifdef PR_LOGGING
|
||||
#include "prlog.h"
|
||||
|
||||
#ifndef PLUGIN_LOGGING // allow external override
|
||||
#define PLUGIN_LOGGING 1 // master compile-time switch for pluging logging
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Basic Plugin Logging Usage Instructions
|
||||
|
@ -75,7 +77,7 @@
|
|||
// http://www.mozilla.org/projects/nspr/reference/html/prlog.html
|
||||
|
||||
|
||||
#ifdef PLUGIN_LOGGING
|
||||
#if PLUGIN_LOGGING
|
||||
|
||||
class nsPluginLogging
|
||||
{
|
||||
|
@ -90,7 +92,7 @@ public:
|
|||
#endif // PR_LOGGING
|
||||
|
||||
// Quick-use macros
|
||||
#ifdef PLUGIN_LOGGING
|
||||
#if PLUGIN_LOGGING
|
||||
#define NPN_PLUGIN_LOG(a, b) \
|
||||
PR_BEGIN_MACRO \
|
||||
PR_LOG(nsPluginLogging::gNPNLog, a, b); \
|
||||
|
@ -100,7 +102,7 @@ public:
|
|||
#define NPN_PLUGIN_LOG(a, b)
|
||||
#endif
|
||||
|
||||
#ifdef PLUGIN_LOGGING
|
||||
#if PLUGIN_LOGGING
|
||||
#define NPP_PLUGIN_LOG(a, b) \
|
||||
PR_BEGIN_MACRO \
|
||||
PR_LOG(nsPluginLogging::gNPPLog, a, b); \
|
||||
|
@ -110,7 +112,7 @@ public:
|
|||
#define NPP_PLUGIN_LOG(a, b)
|
||||
#endif
|
||||
|
||||
#ifdef PLUGIN_LOGGING
|
||||
#if PLUGIN_LOGGING
|
||||
#define PLUGIN_LOG(a, b) \
|
||||
PR_BEGIN_MACRO \
|
||||
PR_LOG(nsPluginLogging::gPluginLog, a, b); \
|
||||
|
|
|
@ -338,6 +338,7 @@ struct nsPluginEvent {
|
|||
|
||||
/*
|
||||
* Non-standard event types that can be passed to HandleEvent
|
||||
* (These need to be kept in sync with the events defined in npapi.h.)
|
||||
*/
|
||||
enum nsPluginEventType {
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
|
@ -346,6 +347,8 @@ enum nsPluginEventType {
|
|||
nsPluginEventType_AdjustCursorEvent,
|
||||
nsPluginEventType_MenuCommandEvent,
|
||||
nsPluginEventType_ClippingChangedEvent,
|
||||
nsPluginEventType_ScrollingBeginsEvent,
|
||||
nsPluginEventType_ScrollingEndsEvent,
|
||||
#endif /* XP_MAC || XP_MACOSX */
|
||||
nsPluginEventType_Idle = 0
|
||||
};
|
||||
|
|
|
@ -1316,7 +1316,7 @@ _requestread(NPStream *pstream, NPByteRange *rangeList)
|
|||
{
|
||||
NPN_PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("NPN_RequestRead: stream=%p\n", (void*)pstream));
|
||||
|
||||
#ifdef PLUGIN_LOGGING
|
||||
#if PLUGIN_LOGGING
|
||||
for(NPByteRange * range = rangeList; range != nsnull; range = range->next)
|
||||
PR_LOG(nsPluginLogging::gNPNLog,PLUGIN_LOG_NOISY,
|
||||
("%i-%i", range->offset, range->offset + range->length - 1));
|
||||
|
|
|
@ -48,7 +48,7 @@ public:
|
|||
|
||||
static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
|
||||
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
|
||||
PRLibrary* aLibrary, nsIPlugin** aResult);
|
||||
};
|
||||
|
||||
|
@ -72,7 +72,7 @@ nsresult nsClassicPluginFactory::Create(nsISupports* aOuter, REFNSIID aIID, void
|
|||
return factory->QueryInterface(aIID, aResult);
|
||||
}
|
||||
|
||||
NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
|
||||
NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
|
||||
PRLibrary* aLibrary, nsIPlugin** aResult)
|
||||
{
|
||||
return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aLibrary, aResult);
|
||||
|
|
|
@ -4260,7 +4260,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
|
|||
nsCOMPtr<nsIClassicPluginFactory> factory =
|
||||
do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
rv = factory->CreatePlugin((nsIServiceManager*)serviceManager,
|
||||
rv = factory->CreatePlugin(serviceManager,
|
||||
pluginTag->mFileName,
|
||||
pluginTag->mLibrary,
|
||||
&pluginTag->mEntryPoint);
|
||||
|
|
Загрузка…
Ссылка в новой задаче