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

Fix null-deref when APZ is disabled and using out-of-process compositing. (bug 1305198, r=kats)

Browse Source
This commit is contained in:
David Anderson 2016-09-24 13:10:12 -07:00
parent ce09635b3d
commit beb37a041d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/ipc/RemoteCompositorSession.cpp
View File

@ -25,8 +25,10 @@ RemoteCompositorSession::RemoteCompositorSession(nsBaseWidget* aWidget,
mAPZ(aAPZ)
{
GPUProcessManager::Get()->RegisterSession(this);
if (mAPZ) {
mAPZ->SetCompositorSession(this);
}
}
RemoteCompositorSession::~RemoteCompositorSession()
{
@ -79,7 +81,9 @@ void
RemoteCompositorSession::Shutdown()
{
mContentController = nullptr;
if (mAPZ) {
mAPZ->SetCompositorSession(nullptr);
}
mCompositorBridgeChild->Destroy();
mCompositorBridgeChild = nullptr;
mCompositorWidgetDelegate = nullptr;