corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 4f6302a98ae4 (bug 1372405)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2017-06-21 13:59:26 +02:00
parent 69d99ffd13
commit 238bf154d5
617 changed files with 3563 additions and 6334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dom/plugins/base/nsNPAPIPluginInstance.cpp
View File

@@ -887,8 +887,7 @@ java::GeckoSurface::LocalRef nsNPAPIPluginInstance::CreateSurface()
return nullptr;
}
nsCOMPtr<nsIRunnable> frameCallback = NewRunnableMethod("nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable",
this, &nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable);
nsCOMPtr<nsIRunnable> frameCallback = NewRunnableMethod(this, &nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable);
java::SurfaceTextureListener::LocalRef listener = java::SurfaceTextureListener::New();
@@ -1448,11 +1447,7 @@ nsNPAPIPluginInstance::ScheduleTimer(uint32_t interval, NPBool repeat, void (*ti
return 0;
}
const short timerType = (repeat ? (short)nsITimer::TYPE_REPEATING_SLACK : (short)nsITimer::TYPE_ONE_SHOT);
xpcomTimer->InitWithNamedFuncCallback(PluginTimerCallback,
newTimer,
interval,
timerType,
"nsNPAPIPluginInstance::ScheduleTimer");
xpcomTimer->InitWithFuncCallback(PluginTimerCallback, newTimer, interval, timerType);
newTimer->timer = xpcomTimer;
// save callback function