From 7cc797bd495256709a3b2c3b71befa751b0061e7 Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Fri, 23 Sep 2016 09:43:47 +1200 Subject: [PATCH] Bug 1303897 - Part 3: Remove unnecessary param to InitIPDLActor. r=nical --- gfx/layers/client/TextureClient.cpp | 4 ++-- gfx/layers/client/TextureClient.h | 2 +- gfx/vr/ipc/VRLayerChild.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp index af96971bf283..032fda57101d 100644 --- a/gfx/layers/client/TextureClient.cpp +++ b/gfx/layers/client/TextureClient.cpp @@ -973,7 +973,7 @@ TextureClient::InitIPDLActor(CompositableForwarder* aForwarder) } bool -TextureClient::InitIPDLActor(TextureForwarder* aForwarder, LayersBackend aBackend) +TextureClient::InitIPDLActor(TextureForwarder* aForwarder) { MOZ_ASSERT(aForwarder && aForwarder->GetMessageLoop() == mAllocator->AsClientAllocator()->GetMessageLoop()); if (mActor && !mActor->mDestroyed) { @@ -1000,7 +1000,7 @@ TextureClient::InitIPDLActor(TextureForwarder* aForwarder, LayersBackend aBacken } mActor = static_cast(aForwarder->CreateTexture(desc, - aBackend, + aForwarder->GetCompositorBackendType(), GetFlags(), mSerial)); MOZ_ASSERT(mActor); diff --git a/gfx/layers/client/TextureClient.h b/gfx/layers/client/TextureClient.h index 1b795c410707..3e71a872c830 100644 --- a/gfx/layers/client/TextureClient.h +++ b/gfx/layers/client/TextureClient.h @@ -580,7 +580,7 @@ public: * Should be called only once per TextureClient. * The TextureClient must not be locked when calling this method. */ - bool InitIPDLActor(TextureForwarder* aForwarder, LayersBackend aBackendType); + bool InitIPDLActor(TextureForwarder* aForwarder); /** * Return a pointer to the IPDLActor. diff --git a/gfx/vr/ipc/VRLayerChild.cpp b/gfx/vr/ipc/VRLayerChild.cpp index 758c92076a0b..e9dd09810ffb 100644 --- a/gfx/vr/ipc/VRLayerChild.cpp +++ b/gfx/vr/ipc/VRLayerChild.cpp @@ -70,7 +70,7 @@ VRLayerChild::SubmitFrame(int32_t aInputFrameID) mFront->SetAddedToCompositableClient(); VRManagerChild* vrmc = VRManagerChild::Get(); mFront->SyncWithObject(vrmc->GetSyncObject()); - MOZ_ALWAYS_TRUE(mFront->InitIPDLActor(vrmc, vrmc->GetBackendType())); + MOZ_ALWAYS_TRUE(mFront->InitIPDLActor(vrmc)); SendSubmitFrame(aInputFrameID, mFront->GetIPDLActor()); }