corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Back out Bug 1127201 (part 2) for various problems.

Browse Source
This commit is contained in:
Andrew McCreight
2015-02-06 15:04:32 -08:00
parent 64644acbbe
commit e048a7df33
347 changed files with 3071 additions and 3032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,7 +185,7 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
NS_ASSERTION(!InTransaction(), "Nested transactions not allowed");
mPhase = PHASE_CONSTRUCTION;
MOZ_ASSERT(mKeepAlive.IsEmpty(), "uncommitted txn?");
NS_ABORT_IF_FALSE(mKeepAlive.IsEmpty(), "uncommitted txn?");
nsRefPtr<gfxContext> targetContext = aTarget;
// If the last transaction was incomplete (a failed DoEmptyTransaction),
@@ -644,11 +644,11 @@ ClientLayerManager::ForwardTransaction(bool aScheduleComposite)
ShadowableLayer*
ClientLayerManager::Hold(Layer* aLayer)
{
MOZ_ASSERT(HasShadowManager(),
"top-level tree, no shadow tree to remote to");
NS_ABORT_IF_FALSE(HasShadowManager(),
"top-level tree, no shadow tree to remote to");
ShadowableLayer* shadowable = ClientLayer::ToClientLayer(aLayer);
MOZ_ASSERT(shadowable, "trying to remote an unshadowable layer");
NS_ABORT_IF_FALSE(shadowable, "trying to remote an unshadowable layer");
mKeepAlive.AppendElement(aLayer);
return shadowable;