зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1352575
(part 3) - Remove PluginModuleChromeParent::mAsyncInitError. r=jimm.
It's unused. --HG-- extra : rebase_source : a52c85e601f47b132e5e4fea1d682f7ee4210bfb
This commit is contained in:
Родитель
04ae66367e
Коммит
3dbe336b54
|
@ -612,26 +612,27 @@ PluginModuleChromeParent::OnProcessLaunched(const bool aSucceeded)
|
|||
|
||||
if (mInitOnAsyncConnect) {
|
||||
mInitOnAsyncConnect = false;
|
||||
NPError dummyError;
|
||||
#if defined(XP_WIN)
|
||||
mAsyncInitRv = NP_GetEntryPoints(mNPPIface,
|
||||
&mAsyncInitError);
|
||||
&dummyError);
|
||||
if (NS_SUCCEEDED(mAsyncInitRv))
|
||||
#endif
|
||||
{
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK)
|
||||
mAsyncInitRv = NP_Initialize(mNPNIface,
|
||||
mNPPIface,
|
||||
&mAsyncInitError);
|
||||
&dummyError);
|
||||
#else
|
||||
mAsyncInitRv = NP_Initialize(mNPNIface,
|
||||
&mAsyncInitError);
|
||||
&dummyError);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(XP_MACOSX)
|
||||
if (NS_SUCCEEDED(mAsyncInitRv)) {
|
||||
mAsyncInitRv = NP_GetEntryPoints(mNPPIface,
|
||||
&mAsyncInitError);
|
||||
&dummyError);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -760,7 +761,6 @@ PluginModuleChromeParent::PluginModuleChromeParent(const char* aFilePath,
|
|||
#endif
|
||||
, mInitOnAsyncConnect(false)
|
||||
, mAsyncInitRv(NS_ERROR_NOT_INITIALIZED)
|
||||
, mAsyncInitError(NPERR_NO_ERROR)
|
||||
, mContentParent(nullptr)
|
||||
{
|
||||
NS_ASSERTION(mSubprocess, "Out of memory!");
|
||||
|
|
|
@ -697,7 +697,6 @@ private:
|
|||
|
||||
bool mInitOnAsyncConnect;
|
||||
nsresult mAsyncInitRv;
|
||||
NPError mAsyncInitError;
|
||||
// mContentParent is to be used ONLY during the IPC dance that occurs
|
||||
// when ContentParent::RecvLoadPlugin is called under async plugin init!
|
||||
// In other contexts it is *unsafe*, as there might be multiple content
|
||||
|
|
Загрузка…
Ссылка в новой задаче