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

Bug 1088300 - Don't attempt to paint a ClientLayerManager if IPC is down (take two). r=dvander

Browse Source
This commit is contained in:
Nicolas Silva 2016-10-12 14:23:32 +02:00
parent c4ddfd637a
commit 349f20d644
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/layers/client/ClientLayerManager.cpp
View File

@ -281,10 +281,6 @@ ClientLayerManager::EndTransactionInternal(DrawPaintedLayerCallback aCallback,
PROFILER_LABEL("ClientLayerManager", "EndTransactionInternal",
js::ProfileEntry::Category::GRAPHICS);
if (!mForwarder || !mForwarder->IPCOpen()) {
return false;
}
#ifdef MOZ_LAYERS_HAVE_LOG
MOZ_LAYERS_LOG((" ----- (beginning paint)"));
Log();
@ -359,6 +355,12 @@ ClientLayerManager::EndTransaction(DrawPaintedLayerCallback aCallback,
void* aCallbackData,
EndTransactionFlags aFlags)
{
if (!mForwarder->IPCOpen()) {
mTransactionIdAllocator->RevokeTransactionId(mLatestTransactionId);
mInTransaction = false;
return;
}
if (mWidget) {
mWidget->PrepareWindowEffects();
}
@ -384,9 +386,11 @@ ClientLayerManager::EndEmptyTransaction(EndTransactionFlags aFlags)
{
mInTransaction = false;
if (!mRoot) {
if (!mRoot || !mForwarder->IPCOpen()) {
mTransactionIdAllocator->RevokeTransactionId(mLatestTransactionId);
return false;
}
if (!EndTransactionInternal(nullptr, nullptr, aFlags)) {
// Return without calling ForwardTransaction. This leaves the
// ShadowLayerForwarder transaction open; the following