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

Bug 775697 - Cancel layer transactions that haven't ended after nsDisplaySVGEffects::PaintAsLayer returns. r=roc.

Browse Source
This commit is contained in:
Jonathan Watt 2012-07-20 00:53:55 -04:00
parent f28956b0e5
commit 613454044e
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/layers/basic/BasicLayerManager.cpp
View File

@ -384,6 +384,16 @@ BasicLayerManager::EndTransaction(DrawThebesLayerCallback aCallback,
EndTransactionInternal(aCallback, aCallbackData, aFlags);
}
void
BasicLayerManager::AbortTransaction()
{
NS_ASSERTION(InConstruction(), "Should be in construction phase");
#ifdef DEBUG
mPhase = PHASE_NONE;
#endif
mUsingDefaultTarget = false;
}
bool
BasicLayerManager::EndTransactionInternal(DrawThebesLayerCallback aCallback,
void* aCallbackData,

1
gfx/layers/basic/BasicLayers.h
View File

@ -94,6 +94,7 @@ public:
virtual void EndTransaction(DrawThebesLayerCallback aCallback,
void* aCallbackData,
EndTransactionFlags aFlags = END_DEFAULT);
void AbortTransaction();
virtual void SetRoot(Layer* aLayer);

3
layout/base/FrameLayerBuilder.cpp
View File

@ -1636,6 +1636,9 @@ PaintInactiveLayer(nsDisplayListBuilder* aBuilder,
aLayerBuilder->WillEndTransaction(tempManager);
if (aItem->GetType() == nsDisplayItem::TYPE_SVG_EFFECTS) {
static_cast<nsDisplaySVGEffects*>(aItem)->PaintAsLayer(aBuilder, aCtx, tempManager);
if (tempManager->InTransaction()) {
tempManager->AbortTransaction();
}
} else {
tempManager->EndTransaction(FrameLayerBuilder::DrawThebesLayer, aBuilder);
}