зеркало из https://github.com/mozilla/gecko-dev.git
Fix for bug 85231. Free nsTimer in PluginInstance to eliminate MLK and crash caused by it. r=av, peterl. sr=scc.
This commit is contained in:
Родитель
ea301392e9
Коммит
345a818aba
|
@ -1612,7 +1612,7 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner()
|
|||
|
||||
// shut off the timer.
|
||||
if (mPluginTimer != nsnull) {
|
||||
mPluginTimer->Cancel();
|
||||
CancelTimer();
|
||||
}
|
||||
|
||||
if (nsnull != mInstance)
|
||||
|
@ -3099,6 +3099,7 @@ void nsPluginInstanceOwner::CancelTimer()
|
|||
{
|
||||
if (mPluginTimer) {
|
||||
mPluginTimer->Cancel();
|
||||
mPluginTimer = nsnull;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1612,7 +1612,7 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner()
|
|||
|
||||
// shut off the timer.
|
||||
if (mPluginTimer != nsnull) {
|
||||
mPluginTimer->Cancel();
|
||||
CancelTimer();
|
||||
}
|
||||
|
||||
if (nsnull != mInstance)
|
||||
|
@ -3099,6 +3099,7 @@ void nsPluginInstanceOwner::CancelTimer()
|
|||
{
|
||||
if (mPluginTimer) {
|
||||
mPluginTimer->Cancel();
|
||||
mPluginTimer = nsnull;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -915,7 +915,7 @@ pluginInstanceOwner :: ~pluginInstanceOwner()
|
|||
{
|
||||
// shut off the timer.
|
||||
if (mPluginTimer != nsnull) {
|
||||
mPluginTimer->Cancel();
|
||||
CancelTimer();
|
||||
}
|
||||
|
||||
if (nsnull != mInstance)
|
||||
|
@ -1254,6 +1254,7 @@ void pluginInstanceOwner::CancelTimer()
|
|||
{
|
||||
if (mPluginTimer) {
|
||||
mPluginTimer->Cancel();
|
||||
mPluginTimer = nsnull;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -915,7 +915,7 @@ pluginInstanceOwner :: ~pluginInstanceOwner()
|
|||
{
|
||||
// shut off the timer.
|
||||
if (mPluginTimer != nsnull) {
|
||||
mPluginTimer->Cancel();
|
||||
CancelTimer();
|
||||
}
|
||||
|
||||
if (nsnull != mInstance)
|
||||
|
@ -1254,6 +1254,7 @@ void pluginInstanceOwner::CancelTimer()
|
|||
{
|
||||
if (mPluginTimer) {
|
||||
mPluginTimer->Cancel();
|
||||
mPluginTimer = nsnull;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче