Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 627399: Do not forget mTarget if a transaction is incomplete. r=cjoned a=blocking-beta10

Browse Source
This commit is contained in:
Bas Schouten 2011-01-21 06:46:38 +01:00
parent c449e0ada7
commit 1fa726d5c6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/layers/basic/BasicLayers.cpp
View File

@ -1287,7 +1287,13 @@ BasicLayerManager::EndTransactionInternal(DrawThebesLayerCallback aCallback,
PopGroupWithCachedSurface(finalTarget, cachedSurfaceOffset);
}
mTarget = nsnull;
if (!mTransactionIncomplete) {
// Clear out target if we have a complete transaction.
mTarget = nsnull;
} else {
// If we don't have a complete transaction set back to the old mTarget.
mTarget = finalTarget;
}
}
#ifdef MOZ_LAYERS_HAVE_LOG
@ -1300,11 +1306,18 @@ BasicLayerManager::EndTransactionInternal(DrawThebesLayerCallback aCallback,
// Layout will update the layer tree and call EndTransaction().
mPhase = mTransactionIncomplete ? PHASE_CONSTRUCTION : PHASE_NONE;
#endif
mUsingDefaultTarget = PR_FALSE;
if (!mTransactionIncomplete) {
// This is still valid if the transaction was incomplete.
mUsingDefaultTarget = PR_FALSE;
}
NS_ASSERTION(!aCallback || !mTransactionIncomplete,
"If callback is not null, transaction must be complete");
// XXX - We should probably assert here that for an incomplete transaction
// out target is the default target.
return !mTransactionIncomplete;
}