mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Fix null-deref when APZ is disabled and using out-of-process compositing. (bug 1305198, r=kats)
This commit is contained in:
parent
ce09635b3d
commit
beb37a041d
@ -25,7 +25,9 @@ RemoteCompositorSession::RemoteCompositorSession(nsBaseWidget* aWidget,
|
||||
mAPZ(aAPZ)
|
||||
{
|
||||
GPUProcessManager::Get()->RegisterSession(this);
|
||||
mAPZ->SetCompositorSession(this);
|
||||
if (mAPZ) {
|
||||
mAPZ->SetCompositorSession(this);
|
||||
}
|
||||
}
|
||||
|
||||
RemoteCompositorSession::~RemoteCompositorSession()
|
||||
@ -79,7 +81,9 @@ void
|
||||
RemoteCompositorSession::Shutdown()
|
||||
{
|
||||
mContentController = nullptr;
|
||||
mAPZ->SetCompositorSession(nullptr);
|
||||
if (mAPZ) {
|
||||
mAPZ->SetCompositorSession(nullptr);
|
||||
}
|
||||
mCompositorBridgeChild->Destroy();
|
||||
mCompositorBridgeChild = nullptr;
|
||||
mCompositorWidgetDelegate = nullptr;
|
||||
|
Loading…
Reference in New Issue
Block a user