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

Bug 1284051 - Handle ShadowLayers::GetCompositorBridgeChild returning null. r=sotaro

Browse Source
This commit is contained in:
Nicolas Silva 2016-07-04 15:10:22 +02:00
parent a7a3dcf9d4
commit 867e2c403e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/layers/ipc/ShadowLayers.cpp
View File

@ -1096,19 +1096,27 @@ ShadowLayerForwarder::DestroySurfaceDescriptor(SurfaceDescriptor* aSurface)
void
ShadowLayerForwarder::UpdateFwdTransactionId()
{
GetCompositorBridgeChild()->UpdateFwdTransactionId();
auto compositorBridge = GetCompositorBridgeChild();
if (compositorBridge) {
compositorBridge->UpdateFwdTransactionId();
}
}
uint64_t
ShadowLayerForwarder::GetFwdTransactionId()
{
return GetCompositorBridgeChild()->GetFwdTransactionId();
auto compositorBridge = GetCompositorBridgeChild();
MOZ_DIAGNOSTIC_ASSERT(compositorBridge);
return compositorBridge ? compositorBridge->GetFwdTransactionId() : 0;
}
void
ShadowLayerForwarder::CancelWaitForRecycle(uint64_t aTextureId)
{
GetCompositorBridgeChild()->CancelWaitForRecycle(aTextureId);
auto compositorBridge = GetCompositorBridgeChild();
if (compositorBridge) {
compositorBridge->CancelWaitForRecycle(aTextureId);
}
}
CompositorBridgeChild*
@ -1117,6 +1125,9 @@ ShadowLayerForwarder::GetCompositorBridgeChild()
if (mCompositorBridgeChild) {
return mCompositorBridgeChild;
}
if (!mShadowManager) {
return nullptr;
}
mCompositorBridgeChild = static_cast<CompositorBridgeChild*>(mShadowManager->Manager());
return mCompositorBridgeChild;
}