Bug 1350940 - Label Runnables in dom/plugins; r=bsmedberg
MozReview-Commit-ID: DCxeZUj6CEd
--- a/dom/plugins/base/android/ANPAudio.cpp
+++ b/dom/plugins/base/android/ANPAudio.cpp
@@ -107,17 +107,19 @@ struct ANPAudioTrack {
ANPAudioTrack() : lock("ANPAudioTrack") { }
};
class AudioRunnable : public mozilla::Runnable
{
public:
NS_DECL_NSIRUNNABLE
- AudioRunnable(ANPAudioTrack* aAudioTrack) {
+ AudioRunnable(ANPAudioTrack* aAudioTrack) :
+ Runnable("AudioRunnable")
+ {
mTrack = aAudioTrack;
}
ANPAudioTrack* mTrack;
};
NS_IMETHODIMP
AudioRunnable::Run()
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -552,17 +552,20 @@ NPPExceptionAutoHolder::~NPPExceptionAut
NS_ASSERTION(!gNPPException, "NPP exception not properly cleared!");
gNPPException = mOldException;
}
nsPluginThreadRunnable::nsPluginThreadRunnable(NPP instance,
PluginThreadCallback func,
void *userData)
- : mInstance(instance), mFunc(func), mUserData(userData)
+ : Runnable("nsPluginThreadRunnable"),
+ mInstance(instance),
+ mFunc(func),
+ mUserData(userData)
{
if (!sPluginThreadAsyncCallLock) {
// Failed to create lock, not much we can do here then...
mFunc = nullptr;
return;
}
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -63,17 +63,22 @@ using namespace mozilla;
using namespace mozilla::gl;
typedef nsNPAPIPluginInstance::VideoInfo VideoInfo;
class PluginEventRunnable : public Runnable
{
public:
PluginEventRunnable(nsNPAPIPluginInstance* instance, ANPEvent* event)
- : mInstance(instance), mEvent(*event), mCanceled(false) {}
+ : Runnable("PluginEventRunnable"),
+ mInstance(instance),
+ mEvent(*event),
+ mCanceled(false)
+ {
+ }
virtual nsresult Run() {
if (mCanceled)
return NS_OK;
mInstance->HandleEvent(&mEvent, nullptr);
mInstance->PopPostedEvent(this);
return NS_OK;
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -1296,17 +1296,20 @@ nsPluginHost::GetPluginForContentProcess
}
return NS_ERROR_FAILURE;
}
class nsPluginUnloadRunnable : public Runnable
{
public:
- explicit nsPluginUnloadRunnable(uint32_t aPluginId) : mPluginId(aPluginId) {}
+ explicit nsPluginUnloadRunnable(uint32_t aPluginId) :
+ Runnable("nsPluginUnloadRunnable"),
+ mPluginId(aPluginId)
+ {}
NS_IMETHOD Run() override
{
RefPtr<nsPluginHost> host = nsPluginHost::GetInst();
if (!host) {
return NS_OK;
}
nsPluginTag* pluginTag = host->PluginWithId(mPluginId);
@@ -3959,17 +3962,18 @@ nsPluginHost::DestroyRunningInstances(ns
// Runnable that does an async destroy of a plugin.
class nsPluginDestroyRunnable : public Runnable,
public PRCList
{
public:
explicit nsPluginDestroyRunnable(nsNPAPIPluginInstance *aInstance)
- : mInstance(aInstance)
+ : Runnable("nsPluginDestroyRunnable"),
+ mInstance(aInstance)
{
PR_INIT_CLIST(this);
PR_APPEND_LINK(this, &sRunnableListHead);
}
~nsPluginDestroyRunnable() override
{
PR_REMOVE_LINK(this);
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -129,17 +129,19 @@ public:
return nsEventStatus_eConsumeNoDefault;
}
};
class AsyncPaintWaitEvent : public Runnable
{
public:
AsyncPaintWaitEvent(nsIContent* aContent, bool aFinished) :
- mContent(aContent), mFinished(aFinished)
+ Runnable("AsyncPaintWaitEvent"),
+ mContent(aContent),
+ mFinished(aFinished)
{
}
NS_IMETHOD Run() override
{
nsContentUtils::DispatchTrustedEvent(mContent->OwnerDoc(), mContent,
mFinished ? NS_LITERAL_STRING("MozPaintWaitFinished") : NS_LITERAL_STRING("MozPaintWait"),
true, true);
--- a/dom/plugins/base/nsPluginNativeWindowWin.cpp
+++ b/dom/plugins/base/nsPluginNativeWindowWin.cpp
@@ -62,17 +62,18 @@ public:
protected:
PluginWindowWeakRef mPluginWindowRef;
HWND mWnd;
UINT mMsg;
WPARAM mWParam;
LPARAM mLParam;
};
-PluginWindowEvent::PluginWindowEvent()
+PluginWindowEvent::PluginWindowEvent() :
+ Runnable("PluginWindowEvent")
{
Clear();
}
void PluginWindowEvent::Clear()
{
mWnd = nullptr;
mMsg = 0;
@@ -155,17 +156,18 @@ static bool ProcessFlashMessageDelayed(n
}
return false;
}
class nsDelayedPopupsEnabledEvent : public Runnable
{
public:
explicit nsDelayedPopupsEnabledEvent(nsNPAPIPluginInstance *inst)
- : mInst(inst)
+ : Runnable("nsDelayedPopupsEnabledEvent"),
+ mInst(inst)
{}
NS_DECL_NSIRUNNABLE
private:
RefPtr<nsNPAPIPluginInstance> mInst;
};
--- a/dom/plugins/ipc/PluginHangUIParent.cpp
+++ b/dom/plugins/ipc/PluginHangUIParent.cpp
@@ -33,17 +33,18 @@ using std::string;
using std::vector;
namespace {
class nsPluginHangUITelemetry : public mozilla::Runnable
{
public:
nsPluginHangUITelemetry(int aResponseCode, int aDontAskCode,
uint32_t aResponseTimeMs, uint32_t aTimeoutMs)
- : mResponseCode(aResponseCode),
+ : Runnable("nsPluginHangUITelemetry"),
+ mResponseCode(aResponseCode),
mDontAskCode(aDontAskCode),
mResponseTimeMs(aResponseTimeMs),
mTimeoutMs(aTimeoutMs)
{
}
NS_IMETHOD
Run() override
--- a/dom/plugins/ipc/PluginMessageUtils.cpp
+++ b/dom/plugins/ipc/PluginMessageUtils.cpp
@@ -18,17 +18,18 @@ using std::string;
using mozilla::ipc::MessageChannel;
namespace {
class DeferNPObjectReleaseRunnable : public mozilla::Runnable
{
public:
DeferNPObjectReleaseRunnable(const NPNetscapeFuncs* f, NPObject* o)
- : mFuncs(f)
+ : Runnable("DeferNPObjectReleaseRunnable")
+ , mFuncs(f)
, mObject(o)
{
NS_ASSERTION(o, "no release null objects");
}
NS_IMETHOD Run();
private:
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -2065,17 +2065,20 @@ SHORT WINAPI PMCGetKeyState(int aVirtKey
class GetKeyStateTask : public Runnable
{
SHORT* mKeyState;
int mVirtKey;
HANDLE mSemaphore;
public:
explicit GetKeyStateTask(int aVirtKey, HANDLE aSemaphore, SHORT* aKeyState) :
- mVirtKey(aVirtKey), mSemaphore(aSemaphore), mKeyState(aKeyState)
+ Runnable("GetKeyStateTask"),
+ mVirtKey(aVirtKey),
+ mSemaphore(aSemaphore),
+ mKeyState(aKeyState)
{}
NS_IMETHOD Run() override
{
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();
*mKeyState = PMCGetKeyState(mVirtKey);
if (!ReleaseSemaphore(mSemaphore, 1, nullptr)) {
@@ -2136,18 +2139,19 @@ class GetFileNameTask : public Runnable
BOOL* mReturnValue;
void* mLpOpenFileName;
HANDLE mSemaphore;
GetFileNameFunc mFunc;
public:
explicit GetFileNameTask(GetFileNameFunc func, void* aLpOpenFileName,
HANDLE aSemaphore, BOOL* aReturnValue) :
- mLpOpenFileName(aLpOpenFileName), mSemaphore(aSemaphore),
- mReturnValue(aReturnValue), mFunc(func)
+ Runnable("GetFileNameTask"), mLpOpenFileName(aLpOpenFileName),
+ mSemaphore(aSemaphore), mReturnValue(aReturnValue),
+ mFunc(func)
{}
NS_IMETHOD Run() override
{
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();
switch (mFunc) {
case OPEN_FUNC:
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -149,17 +149,18 @@ mozilla::plugins::SetupBridge(uint32_t a
/**
* Use for executing CreateToolhelp32Snapshot off main thread
*/
class mozilla::plugins::FinishInjectorInitTask : public mozilla::CancelableRunnable
{
public:
FinishInjectorInitTask()
- : mMutex("FlashInjectorInitTask::mMutex")
+ : CancelableRunnable("FinishInjectorInitTask")
+ , mMutex("FlashInjectorInitTask::mMutex")
, mParent(nullptr)
, mMainThreadMsgLoop(MessageLoop::current())
{
MOZ_ASSERT(NS_IsMainThread());
}
void Init(PluginModuleChromeParent* aParent)
{
--- a/dom/plugins/ipc/PluginUtilsWin.cpp
+++ b/dom/plugins/ipc/PluginUtilsWin.cpp
@@ -17,17 +17,18 @@ namespace PluginUtilsWin {
typedef nsTHashtable<nsPtrHashKey<PluginModuleParent>> PluginModuleSet;
StaticMutex sMutex;
class AudioDeviceChangedRunnable : public Runnable
{
public:
explicit AudioDeviceChangedRunnable(const PluginModuleSet* aAudioNotificationSet,
NPAudioDeviceChangeDetailsIPC aChangeDetails) :
- mChangeDetails(aChangeDetails)
+ Runnable("AudioDeviceChangedRunnable")
+ , mChangeDetails(aChangeDetails)
, mAudioNotificationSet(aAudioNotificationSet)
{}
NS_IMETHOD Run() override
{
StaticMutexAutoLock lock(sMutex);
PLUGIN_LOG_DEBUG(("Notifying %d plugins of audio device change.",
mAudioNotificationSet->Count()));