diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp index ae5482594728..592d553c8f62 100644 --- a/gfx/layers/ipc/CompositorParent.cpp +++ b/gfx/layers/ipc/CompositorParent.cpp @@ -738,11 +738,11 @@ SetShadowProperties(Layer* aLayer) } void -CompositorParent::ScheduleRotationOnCompositorThread(const TargetConfig& aTargetConfig, - bool aIsFirstPaint) +CompositorParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree, + const TargetConfig& aTargetConfig, + bool aIsFirstPaint, + bool aScheduleComposite) { - MOZ_ASSERT(IsInCompositorThread()); - if (!aIsFirstPaint && !mCompositionManager->IsFirstPaint() && mCompositionManager->RequiresReorientation(aTargetConfig.orientation())) { @@ -752,15 +752,6 @@ CompositorParent::ScheduleRotationOnCompositorThread(const TargetConfig& aTarget mForceCompositionTask = NewRunnableMethod(this, &CompositorParent::ForceComposition); ScheduleTask(mForceCompositionTask, gfxPrefs::OrientationSyncMillis()); } -} - -void -CompositorParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree, - const TargetConfig& aTargetConfig, - bool aIsFirstPaint, - bool aScheduleComposite) -{ - ScheduleRotationOnCompositorThread(aTargetConfig, aIsFirstPaint); // Instruct the LayerManager to update its render bounds now. Since all the orientation // change, dimension change would be done at the stage, update the size here is free of @@ -1259,12 +1250,7 @@ CrossProcessCompositorParent::ShadowLayersUpdated( bool aScheduleComposite) { uint64_t id = aLayerTree->GetId(); - MOZ_ASSERT(id != 0); - MOZ_ASSERT(sIndirectLayerTrees[id].mParent); - - sIndirectLayerTrees[id].mParent->ScheduleRotationOnCompositorThread(aTargetConfig, aIsFirstPaint); - Layer* shadowRoot = aLayerTree->GetRoot(); if (shadowRoot) { SetShadowProperties(shadowRoot); diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h index 3af7111e178b..b0cc866524b7 100644 --- a/gfx/layers/ipc/CompositorParent.h +++ b/gfx/layers/ipc/CompositorParent.h @@ -129,12 +129,6 @@ public: virtual void ScheduleComposition(); void NotifyShadowTreeTransaction(uint64_t aId, bool aIsFirstPaint, bool aScheduleComposite); - /** - * Check rotation info and schedule a rendering task if needed. - * Only can be called from compositor thread. - */ - void ScheduleRotationOnCompositorThread(const TargetConfig& aTargetConfig, bool aIsFirstPaint); - /** * Returns the unique layer tree identifier that corresponds to the root * tree of this compositor.