Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1122943 - Ensure the Compositor Vsync Observer Shutsdown correctly. r=benwa

Browse Source
This commit is contained in:
Mason Chang 2015-01-21 16:13:15 -08:00
parent 874afdcae9
commit c38b87fe5d
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gfx/layers/ipc/CompositorParent.cpp
View File

@ -215,6 +215,8 @@ CompositorVsyncObserver::CompositorVsyncObserver(CompositorParent* aCompositorPa
, mCompositorParent(aCompositorParent)
, mCurrentCompositeTaskMonitor("CurrentCompositeTaskMonitor")
, mCurrentCompositeTask(nullptr)
, mSetNeedsCompositeMonitor("SetNeedsCompositeMonitor")
, mSetNeedsCompositeTask(nullptr)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aWidget != nullptr);
@ -229,9 +231,28 @@ CompositorVsyncObserver::~CompositorVsyncObserver()
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
MOZ_ASSERT(!mIsObservingVsync);
// The CompositorVsyncDispatcher is cleaned up before this in the nsBaseWidget, which stops vsync listeners
CancelCurrentCompositeTask();
mCompositorParent = nullptr;
mCompositorVsyncDispatcher = nullptr;
}
void
CompositorVsyncObserver::Destroy()
{
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
UnobserveVsync();
CancelCurrentCompositeTask();
CancelCurrentSetNeedsCompositeTask();
}
void
CompositorVsyncObserver::CancelCurrentSetNeedsCompositeTask()
{
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
MonitorAutoLock lock(mSetNeedsCompositeMonitor);
if (mSetNeedsCompositeTask) {
mSetNeedsCompositeTask->Cancel();
mSetNeedsCompositeTask = nullptr;
}
mNeedsComposite = false;
}
@ -245,11 +266,16 @@ CompositorVsyncObserver::~CompositorVsyncObserver()
void
CompositorVsyncObserver::SetNeedsComposite(bool aNeedsComposite)
{
if (aNeedsComposite && !CompositorParent::IsInCompositorThread()) {
CompositorParent::CompositorLoop()->PostTask(FROM_HERE,
NewRunnableMethod(this,
&CompositorVsyncObserver::SetNeedsComposite,
aNeedsComposite));
if (!CompositorParent::IsInCompositorThread()) {
MonitorAutoLock lock(mSetNeedsCompositeMonitor);
mSetNeedsCompositeTask = NewRunnableMethod(this,
&CompositorVsyncObserver::SetNeedsComposite,
aNeedsComposite);
CompositorParent::CompositorLoop()->PostTask(FROM_HERE, mSetNeedsCompositeTask);
return;
} else {
MonitorAutoLock lock(mSetNeedsCompositeMonitor);
mSetNeedsCompositeTask = nullptr;
}
mNeedsComposite = aNeedsComposite;
@ -324,7 +350,7 @@ CompositorVsyncObserver::ObserveVsync()
void
CompositorVsyncObserver::UnobserveVsync()
{
MOZ_ASSERT(CompositorParent::IsInCompositorThread() || NS_IsMainThread());
MOZ_ASSERT(CompositorParent::IsInCompositorThread());
mCompositorVsyncDispatcher->SetCompositorVsyncObserver(nullptr);
mIsObservingVsync = false;
}
@ -437,6 +463,7 @@ CompositorParent::Destroy()
NS_ABORT_IF_FALSE(ManagedPLayerTransactionParent().Length() == 0,
"CompositorParent destroyed before managed PLayerTransactionParent");
MOZ_ASSERT(mPaused); // Ensure RecvWillStop was called
// Ensure that the layer manager is destructed on the compositor thread.
mLayerManager = nullptr;
if (mCompositor) {
@ -454,7 +481,7 @@ CompositorParent::Destroy()
sIndirectLayerTrees.erase(mRootLayerTreeID);
}
if (mCompositorVsyncObserver) {
mCompositorVsyncObserver->UnobserveVsync();
mCompositorVsyncObserver->Destroy();
mCompositorVsyncObserver = nullptr;
}
}
@ -793,7 +820,7 @@ CompositorParent::ScheduleSoftwareTimerComposition()
{
MOZ_ASSERT(!gfxPrefs::VsyncAlignedCompositor());
if (mCurrentCompositeTask || mPaused) {
if (mCurrentCompositeTask) {
return;
}
@ -830,6 +857,10 @@ void
CompositorParent::ScheduleComposition()
{
MOZ_ASSERT(IsInCompositorThread());
if (mPaused) {
return;
}
if (gfxPrefs::VsyncAlignedCompositor()) {
mCompositorVsyncObserver->SetNeedsComposite(true);
} else {

5
gfx/layers/ipc/CompositorParent.h
View File

@ -105,6 +105,7 @@ public:
void SetNeedsComposite(bool aSchedule);
bool NeedsComposite();
void CancelCurrentCompositeTask();
void Destroy();
private:
virtual ~CompositorVsyncObserver();
@ -114,6 +115,7 @@ private:
void ObserveVsync();
void UnobserveVsync();
void DispatchTouchEvents(TimeStamp aVsyncTimestamp);
void CancelCurrentSetNeedsCompositeTask();
bool mNeedsComposite;
bool mIsObservingVsync;
@ -123,6 +125,9 @@ private:
mozilla::Monitor mCurrentCompositeTaskMonitor;
CancelableTask* mCurrentCompositeTask;
mozilla::Monitor mSetNeedsCompositeMonitor;
CancelableTask* mSetNeedsCompositeTask;
};
class CompositorParent MOZ_FINAL : public PCompositorParent,