Merge m-c to graphics

MozReview-Commit-ID: AzRIytAgP96
This commit is contained in:
Kartikaya Gupta
2017-03-08 10:08:57 -05:00
573 changed files with 10228 additions and 7467 deletions

View File

@@ -11,6 +11,7 @@
#include "base/task.h" // for CancelableTask, etc
#include "base/thread.h" // for Thread
#include "mozilla/ipc/Transport.h" // for Transport
#include "mozilla/layers/AnimationHelper.h" // for CompositorAnimationStorage
#include "mozilla/layers/APZCTreeManager.h" // for APZCTreeManager
#include "mozilla/layers/APZCTreeManagerParent.h" // for APZCTreeManagerParent
#include "mozilla/layers/APZThreadUtils.h" // for APZCTreeManager
@@ -408,6 +409,22 @@ CrossProcessCompositorBridgeParent::ApplyAsyncProperties(
state->mParent->ApplyAsyncProperties(aLayerTree);
}
CompositorAnimationStorage*
CrossProcessCompositorBridgeParent::GetAnimationStorage(
const uint64_t& aId)
{
MOZ_ASSERT(aId != 0);
const CompositorBridgeParent::LayerTreeState* state =
CompositorBridgeParent::GetIndirectShadowTree(aId);
if (!state) {
return nullptr;
}
MOZ_ASSERT(state->mParent);
// GetAnimationStorage in CompositorBridgeParent expects id as 0
return state->mParent->GetAnimationStorage(0);
}
void
CrossProcessCompositorBridgeParent::FlushApzRepaints(const LayerTransactionParent* aLayerTree)
{