Bug 1350638 - Remove the GetCompositorOptions IPC message as it is no longer used. r?dvander
MozReview-Commit-ID: 18uiWGA9eJy
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -1135,32 +1135,16 @@ CompositorBridgeParent::AllocPAPZParent(
bool
CompositorBridgeParent::DeallocPAPZParent(PAPZParent* aActor)
{
RemoteContentController* controller = static_cast<RemoteContentController*>(aActor);
controller->Release();
return true;
}
-mozilla::ipc::IPCResult
-CompositorBridgeParent::RecvGetCompositorOptions(const uint64_t& aLayersId,
- CompositorOptions* aOptions)
-{
- // The CompositorBridgeParent associated with the layers id should be this
- // one.
- if (aLayersId != 0) {
-#ifdef DEBUG
- MonitorAutoLock lock(*sIndirectLayerTreesLock);
- MOZ_ASSERT(sIndirectLayerTrees[aLayersId].mParent == this);
-#endif
- }
- *aOptions = mOptions;
- return IPC_OK();
-}
-
RefPtr<APZCTreeManager>
CompositorBridgeParent::GetAPZCTreeManager()
{
return mApzcTreeManager;
}
CompositorBridgeParent*
CompositorBridgeParent::GetCompositorBridgeParentFromLayersId(const uint64_t& aLayersId)
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -441,19 +441,16 @@ public:
void ForceComposeToTarget(gfx::DrawTarget* aTarget, const gfx::IntRect* aRect = nullptr);
PAPZCTreeManagerParent* AllocPAPZCTreeManagerParent(const uint64_t& aLayersId) override;
bool DeallocPAPZCTreeManagerParent(PAPZCTreeManagerParent* aActor) override;
PAPZParent* AllocPAPZParent(const uint64_t& aLayersId) override;
bool DeallocPAPZParent(PAPZParent* aActor) override;
- mozilla::ipc::IPCResult RecvGetCompositorOptions(const uint64_t& aLayersId,
- CompositorOptions* aOptions) override;
-
RefPtr<APZCTreeManager> GetAPZCTreeManager();
CompositorOptions GetOptions() const {
return mOptions;
}
PWebRenderBridgeParent* AllocPWebRenderBridgeParent(const wr::PipelineId& aPipelineId,
const LayoutDeviceIntSize& aSize,
--- a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
@@ -107,35 +107,16 @@ bool
CrossProcessCompositorBridgeParent::DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers)
{
LayerTransactionParent* slp = static_cast<LayerTransactionParent*>(aLayers);
EraseLayerState(slp->GetId());
static_cast<LayerTransactionParent*>(aLayers)->ReleaseIPDLReference();
return true;
}
-mozilla::ipc::IPCResult
-CrossProcessCompositorBridgeParent::RecvGetCompositorOptions(const uint64_t& aLayersId,
- CompositorOptions* aOptions)
-{
- // Check to see if this child process has access to this layer tree.
- if (!LayerTreeOwnerTracker::Get()->IsMapped(aLayersId, OtherPid())) {
- NS_ERROR("Unexpected layers id in RecvGetCompositorOptions; dropping message...");
- return IPC_FAIL_NO_REASON(this);
- }
-
- MonitorAutoLock lock(*sIndirectLayerTreesLock);
- CompositorBridgeParent::LayerTreeState& state = sIndirectLayerTrees[aLayersId];
-
- if (state.mParent) {
- *aOptions = state.mParent->GetOptions();
- }
- return IPC_OK();
-}
-
PAPZCTreeManagerParent*
CrossProcessCompositorBridgeParent::AllocPAPZCTreeManagerParent(const uint64_t& aLayersId)
{
// Check to see if this child process has access to this layer tree.
if (!LayerTreeOwnerTracker::Get()->IsMapped(aLayersId, OtherPid())) {
NS_ERROR("Unexpected layers id in AllocPAPZCTreeManagerParent; dropping message...");
return nullptr;
}
--- a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h
+++ b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h
@@ -140,18 +140,16 @@ public:
// Not allowed.
return nullptr;
}
bool DeallocPCompositorWidgetParent(PCompositorWidgetParent* aActor) override {
// Not allowed.
return false;
}
- virtual mozilla::ipc::IPCResult RecvGetCompositorOptions(const uint64_t& aLayersId, CompositorOptions* aOptions) override;
-
virtual PAPZCTreeManagerParent* AllocPAPZCTreeManagerParent(const uint64_t& aLayersId) override;
virtual bool DeallocPAPZCTreeManagerParent(PAPZCTreeManagerParent* aActor) override;
virtual PAPZParent* AllocPAPZParent(const uint64_t& aLayersId) override;
virtual bool DeallocPAPZParent(PAPZParent* aActor) override;
virtual void UpdatePaintTime(LayerTransactionParent* aLayerTree, const TimeDuration& aPaintTime) override;
--- a/gfx/layers/ipc/PCompositorBridge.ipdl
+++ b/gfx/layers/ipc/PCompositorBridge.ipdl
@@ -139,19 +139,16 @@ parent:
// Must be called before Initialize().
async PCompositorWidget(CompositorWidgetInitData aInitData);
// When out-of-process, this must be called to finish initialization.
sync Initialize(uint64_t rootLayerTreeId);
sync Reset(LayersBackend[] aBackendHints, uint64_t aSeqNo)
returns (bool aResult, TextureFactoryIdentifier aOutIdentifier);
- // Returns the CompositorOptions for this compositor.
- sync GetCompositorOptions(uint64_t layersId) returns (CompositorOptions aOptions);
-
// Must be called after Initialize(), and only succeeds if AsyncPanZoomEnabled() is true.
async PAPZ(uint64_t layersId);
async PAPZCTreeManager(uint64_t layersId);
/**
* Confirmation callback for UpdatePluginConfigurations and HideAllPlugins.
*/
async RemotePluginsReady();
--- a/ipc/ipdl/sync-messages.ini
+++ b/ipc/ipdl/sync-messages.ini
@@ -975,18 +975,16 @@ description =
[PAPZCTreeManager::ReceiveScrollWheelInputEvent]
description =
[PAPZCTreeManager::TransformEventRefPoint]
description =
[PCompositorBridge::Initialize]
description =
[PCompositorBridge::Reset]
description =
-[PCompositorBridge::GetCompositorOptions]
-description =
[PCompositorBridge::GetFrameUniformity]
description =
[PCompositorBridge::WillClose]
description =
[PCompositorBridge::Pause]
description =
[PCompositorBridge::Resume]
description =