equal
deleted
inserted
replaced
113 } |
113 } |
114 |
114 |
115 /* static */ |
115 /* static */ |
116 already_AddRefed<CompositorBridgeChild> |
116 already_AddRefed<CompositorBridgeChild> |
117 CompositorManagerChild::CreateWidgetCompositorBridge( |
117 CompositorManagerChild::CreateWidgetCompositorBridge( |
118 uint64_t aProcessToken, LayerManager* aLayerManager, uint32_t aNamespace, |
118 uint64_t aProcessToken, WebRenderLayerManager* aLayerManager, |
119 CSSToLayoutDeviceScale aScale, const CompositorOptions& aOptions, |
119 uint32_t aNamespace, CSSToLayoutDeviceScale aScale, |
120 bool aUseExternalSurfaceSize, const gfx::IntSize& aSurfaceSize) { |
120 const CompositorOptions& aOptions, bool aUseExternalSurfaceSize, |
|
121 const gfx::IntSize& aSurfaceSize) { |
121 MOZ_ASSERT(XRE_IsParentProcess()); |
122 MOZ_ASSERT(XRE_IsParentProcess()); |
122 MOZ_ASSERT(NS_IsMainThread()); |
123 MOZ_ASSERT(NS_IsMainThread()); |
123 if (NS_WARN_IF(!sInstance || !sInstance->CanSend())) { |
124 if (NS_WARN_IF(!sInstance || !sInstance->CanSend())) { |
124 return nullptr; |
125 return nullptr; |
125 } |
126 } |
143 } |
144 } |
144 |
145 |
145 /* static */ |
146 /* static */ |
146 already_AddRefed<CompositorBridgeChild> |
147 already_AddRefed<CompositorBridgeChild> |
147 CompositorManagerChild::CreateSameProcessWidgetCompositorBridge( |
148 CompositorManagerChild::CreateSameProcessWidgetCompositorBridge( |
148 LayerManager* aLayerManager, uint32_t aNamespace) { |
149 WebRenderLayerManager* aLayerManager, uint32_t aNamespace) { |
149 MOZ_ASSERT(XRE_IsParentProcess()); |
150 MOZ_ASSERT(XRE_IsParentProcess()); |
150 MOZ_ASSERT(NS_IsMainThread()); |
151 MOZ_ASSERT(NS_IsMainThread()); |
151 if (NS_WARN_IF(!sInstance || !sInstance->CanSend())) { |
152 if (NS_WARN_IF(!sInstance || !sInstance->CanSend())) { |
152 return nullptr; |
153 return nullptr; |
153 } |
154 } |