Bug 1352575 (part 6) - Remove AsyncNPP_New. r=jimm.

And related code.

--HG--
extra : rebase_source : 55e76551a0555dda6acf6b07ba792afc48a1c0aa
This commit is contained in:
Nicholas Nethercote 2017-04-18 16:56:43 +10:00
Родитель c67ffb04c6
Коммит b3ddc9836a
3 изменённых файлов: 0 добавлений и 49 удалений

Просмотреть файл

@ -73,9 +73,6 @@ child:
intr SyncNPP_New(PPluginInstance aActor)
returns (NPError rv);
// Implements the async plugin init version of NPP_New.
async AsyncNPP_New(PPluginInstance aActor);
intr NP_Shutdown()
returns (NPError rv);

Просмотреть файл

@ -2386,51 +2386,6 @@ PluginModuleChild::AnswerSyncNPP_New(PPluginInstanceChild* aActor, NPError* rv)
return IPC_OK();
}
class AsyncNewResultSender : public ChildAsyncCall
{
public:
AsyncNewResultSender(PluginInstanceChild* aInstance, NPError aResult)
: ChildAsyncCall(aInstance, nullptr, nullptr)
, mResult(aResult)
{
}
NS_IMETHOD Run() override
{
RemoveFromAsyncList();
DebugOnly<bool> sendOk = mInstance->SendAsyncNPP_NewResult(mResult);
MOZ_ASSERT(sendOk);
return NS_OK;
}
private:
NPError mResult;
};
static void
RunAsyncNPP_New(void* aChildInstance)
{
MOZ_ASSERT(aChildInstance);
PluginInstanceChild* childInstance =
static_cast<PluginInstanceChild*>(aChildInstance);
NPError rv = childInstance->DoNPP_New();
RefPtr<AsyncNewResultSender> task =
new AsyncNewResultSender(childInstance, rv);
childInstance->PostChildAsyncCall(task.forget());
}
mozilla::ipc::IPCResult
PluginModuleChild::RecvAsyncNPP_New(PPluginInstanceChild* aActor)
{
PLUGIN_LOG_DEBUG_METHOD;
PluginInstanceChild* childInstance =
reinterpret_cast<PluginInstanceChild*>(aActor);
AssertPluginThread();
// We don't want to run NPP_New async from within nested calls
childInstance->AsyncCall(&RunAsyncNPP_New, childInstance);
return IPC_OK();
}
bool
PluginModuleChild::DeallocPPluginInstanceChild(PPluginInstanceChild* aActor)
{

Просмотреть файл

@ -75,7 +75,6 @@ protected:
virtual mozilla::ipc::IPCResult RecvAsyncNP_Initialize(const PluginSettings& aSettings) override;
virtual mozilla::ipc::IPCResult AnswerSyncNPP_New(PPluginInstanceChild* aActor, NPError* rv)
override;
virtual mozilla::ipc::IPCResult RecvAsyncNPP_New(PPluginInstanceChild* aActor) override;
virtual mozilla::ipc::IPCResult
RecvInitPluginModuleChild(Endpoint<PPluginModuleChild>&& endpoint) override;