diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 024453e166b2..d1ae3c6fd92a 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -597,8 +597,7 @@ child: async InitRendering(TextureFactoryIdentifier textureFactoryIdentifier, LayersId layersId, CompositorOptions compositorOptions, - bool layersConnected, - bool hasRenderFrame); + bool layersConnected); async LoadURL(nsCString uri, ShowInfo info); diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 18e93a54add1..1bd92c81666b 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -1221,13 +1221,10 @@ mozilla::ipc::IPCResult TabChild::RecvInitRendering(const TextureFactoryIdentifier& aTextureFactoryIdentifier, const layers::LayersId& aLayersId, const CompositorOptions& aCompositorOptions, - const bool& aLayersConnected, - const bool& aHasRenderFrame) + const bool& aLayersConnected) { - MOZ_ASSERT((!mDidFakeShow && aHasRenderFrame) || (mDidFakeShow && !aHasRenderFrame)); - mLayersConnected = Some(aLayersConnected); - InitRenderingState(aTextureFactoryIdentifier, aLayersId, aCompositorOptions, aHasRenderFrame); + InitRenderingState(aTextureFactoryIdentifier, aLayersId, aCompositorOptions); return IPC_OK(); } @@ -2752,17 +2749,10 @@ TabChild::InitTabChildMessageManager() void TabChild::InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIdentifier, const layers::LayersId& aLayersId, - const CompositorOptions& aCompositorOptions, - const bool aHasRenderFrame) + const CompositorOptions& aCompositorOptions) { mPuppetWidget->InitIMEState(); - if (!aHasRenderFrame) { - mLayersConnected = Some(false); - NS_WARNING("failed to construct RenderFrame"); - return; - } - MOZ_ASSERT(aLayersId.IsValid()); mTextureFactoryIdentifier = aTextureFactoryIdentifier; diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h index eca201341c60..d60d6b69ae20 100644 --- a/dom/ipc/TabChild.h +++ b/dom/ipc/TabChild.h @@ -303,8 +303,7 @@ public: RecvInitRendering(const TextureFactoryIdentifier& aTextureFactoryIdentifier, const layers::LayersId& aLayersId, const mozilla::layers::CompositorOptions& aCompositorOptions, - const bool& aLayersConnected, - const bool& aHasRenderFrame) override; + const bool& aLayersConnected) override; virtual mozilla::ipc::IPCResult RecvUpdateDimensions(const mozilla::dom::DimensionInfo& aDimensionInfo) override; @@ -763,8 +762,7 @@ private: void InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIdentifier, const layers::LayersId& aLayersId, - const mozilla::layers::CompositorOptions& aCompositorOptions, - const bool aHasRenderFrame); + const mozilla::layers::CompositorOptions& aCompositorOptions); void InitAPZState(); void DestroyWindow(); diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index d0fdd7f2986f..7f8a17c6e496 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -650,8 +650,7 @@ TabParent::InitRenderFrame() mRenderFrame->GetTextureFactoryIdentifier(&textureFactoryIdentifier); Unused << SendInitRendering(textureFactoryIdentifier, layersId, mRenderFrame->GetCompositorOptions(), - mRenderFrame->IsLayersConnected(), - true); + mRenderFrame->IsLayersConnected()); } void