Jamie Nicol
8e99051731
Future patches to make WebRenderLayerManager able to be initialised asynchronously will be made simpler if we can rely on mWrChild always being non-null. This patch achieves this by moving the first part of Initialize(), which creates the WebRenderBridgeChild, to a static Create() function, which then passes the non-null WebRenderBridgeChild to the constructor. Some existing but now redundant null checks are removed. Unfortunately there is a chicken or egg problem, as WebRenderLayerManager::Create() requires a pointer to the CompositorBridgeChild, but the CompositorBridgeChild is created by the CompositorSession which requires the WebRenderLayerManager in order to call CompositorBridgeChild::InitForWidget(). To solve this we remove the WebRenderLayerManager argument from CompositorBridgeChild::InitForWidget(), and instead have the widget call the function CompositorBridgeChild::CreateLayerManager() to obtain the layer manager. Differential Revision: https://phabricator.services.mozilla.com/D291522
106 lines
3.9 KiB
C++
106 lines
3.9 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "InProcessCompositorSession.h"
|
|
|
|
#include "mozilla/gfx/GPUProcessManager.h"
|
|
#include "mozilla/layers/CompositorBridgeChild.h"
|
|
#include "mozilla/layers/CompositorBridgeParent.h"
|
|
#include "mozilla/layers/CompositorManagerChild.h"
|
|
#include "mozilla/layers/CompositorManagerParent.h"
|
|
#include "mozilla/layers/IAPZCTreeManager.h"
|
|
#include "mozilla/widget/CompositorWidget.h"
|
|
#include "mozilla/widget/PlatformWidgetTypes.h"
|
|
#include "nsIWidget.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
InProcessCompositorSession::InProcessCompositorSession(
|
|
nsIWidget* aWidget, widget::CompositorWidget* aCompositorWidget,
|
|
CompositorBridgeChild* aChild, CompositorBridgeParent* aParent)
|
|
: CompositorSession(aWidget, aCompositorWidget->AsDelegate(), aChild,
|
|
aParent->RootLayerTreeId()),
|
|
mCompositorBridgeParent(aParent),
|
|
mCompositorWidget(aCompositorWidget) {
|
|
gfx::GPUProcessManager::Get()->RegisterInProcessSession(this);
|
|
}
|
|
|
|
/* static */
|
|
RefPtr<InProcessCompositorSession> InProcessCompositorSession::Create(
|
|
nsIWidget* aWidget, const LayersId& aRootLayerTreeId,
|
|
CSSToLayoutDeviceScale aScale, const CompositorOptions& aOptions,
|
|
bool aUseExternalSurfaceSize, const gfx::IntSize& aSurfaceSize,
|
|
uint32_t aNamespace, uint64_t aInnerWindowId) {
|
|
widget::CompositorWidgetInitData initData;
|
|
aWidget->GetCompositorWidgetInitData(&initData);
|
|
|
|
RefPtr<CompositorWidget> widget =
|
|
CompositorWidget::CreateLocal(initData, aOptions, aWidget);
|
|
RefPtr<CompositorBridgeParent> parent =
|
|
CompositorManagerParent::CreateSameProcessWidgetCompositorBridge(
|
|
aScale, aOptions, aUseExternalSurfaceSize, aSurfaceSize,
|
|
aInnerWindowId);
|
|
MOZ_ASSERT(parent);
|
|
parent->InitSameProcess(widget, aRootLayerTreeId);
|
|
|
|
RefPtr<CompositorBridgeChild> child =
|
|
CompositorManagerChild::CreateSameProcessWidgetCompositorBridge(
|
|
aNamespace);
|
|
MOZ_ASSERT(child);
|
|
if (!child) {
|
|
gfxCriticalNote << "Failed to create CompositorBridgeChild";
|
|
return nullptr;
|
|
}
|
|
|
|
return new InProcessCompositorSession(aWidget, widget, child, parent);
|
|
}
|
|
|
|
void InProcessCompositorSession::NotifySessionLost() {
|
|
// Hold a reference to mWidget since NotifyCompositorSessionLost may
|
|
// release the last reference mid-execution.
|
|
RefPtr<nsIWidget> widget(mWidget);
|
|
widget->NotifyCompositorSessionLost(this);
|
|
}
|
|
|
|
CompositorBridgeParent* InProcessCompositorSession::GetInProcessBridge() const {
|
|
return mCompositorBridgeParent;
|
|
}
|
|
|
|
void InProcessCompositorSession::SetContentController(
|
|
GeckoContentController* aController) {
|
|
mCompositorBridgeParent->SetControllerForLayerTree(mRootLayerTreeId,
|
|
aController);
|
|
}
|
|
|
|
RefPtr<IAPZCTreeManager> InProcessCompositorSession::GetAPZCTreeManager()
|
|
const {
|
|
return mCompositorBridgeParent->GetAPZCTreeManager(mRootLayerTreeId);
|
|
}
|
|
|
|
nsIWidget* InProcessCompositorSession::GetWidget() const { return mWidget; }
|
|
|
|
void InProcessCompositorSession::Shutdown() {
|
|
// Destroy will synchronously wait for the parent to acknowledge shutdown,
|
|
// at which point CBP will defer a Release on the compositor thread. We
|
|
// can safely release our reference now, and let the destructor run on either
|
|
// thread.
|
|
#if defined(MOZ_WIDGET_ANDROID)
|
|
if (mUiCompositorControllerChild) {
|
|
mUiCompositorControllerChild->Destroy();
|
|
mUiCompositorControllerChild = nullptr;
|
|
}
|
|
#endif // defined(MOZ_WIDGET_ANDROID)
|
|
if (mCompositorBridgeChild) {
|
|
mCompositorBridgeChild->Destroy();
|
|
mCompositorBridgeChild = nullptr;
|
|
}
|
|
mCompositorBridgeParent = nullptr;
|
|
mCompositorWidget = nullptr;
|
|
gfx::GPUProcessManager::Get()->UnregisterInProcessSession(this);
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|