Backed out changeset 0d658e89549b (bug 854421)

This commit is contained in:
Ed Morley 2014-05-29 10:56:08 +01:00
parent b65fcdc520
commit f645109fad

View File

@ -418,7 +418,6 @@ CompositorParent::PauseComposition()
mPaused = true;
mCompositor->Pause();
DidComposite();
}
// if anyone's waiting to make sure that composition really got paused, tell them
@ -628,7 +627,6 @@ CompositorParent::CompositeToTarget(DrawTarget* aTarget, const nsIntRect* aRect)
mLastCompose = TimeStamp::Now();
if (!CanComposite()) {
DidComposite();
return;
}
@ -785,9 +783,6 @@ CompositorParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
}
if (aScheduleComposite) {
ScheduleComposition();
if (mPaused) {
DidComposite();
}
// When testing we synchronously update the shadow tree with the animated
// values to avoid race conditions when calling GetAnimationTransform etc.
// (since the above SetShadowProperties will remove animation effects).
@ -800,8 +795,6 @@ CompositorParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
mCompositionManager->TransformShadowTree(mTestTime);
if (!requestNextFrame) {
CancelCurrentCompositeTask();
// Pretend we composited in case someone is wating for this event.
DidComposite();
}
}
}
@ -831,8 +824,6 @@ CompositorParent::SetTestSampleTime(LayerTransactionParent* aLayerTree,
bool requestNextFrame = mCompositionManager->TransformShadowTree(aTime);
if (!requestNextFrame) {
CancelCurrentCompositeTask();
// Pretend we composited in case someone is wating for this event.
DidComposite();
}
}