forked from mirrors/gecko-dev
084c9b6f4c
This changes the lifecycle and API for TextureReadLock to fix file descriptor exhaustion
crashes. These changes are partially superficial and mostly align the API of TextureReadLocks
with their actual usage.
The changes are:
1. Create the TextureReadLock in the TextureClient constructor so it's available before IPC creation
a. This is superficial as EnableReadLock was always called before IPC creation
2. Send the ReadLockDescriptor in the PTextureConstructor message and close the file handle
3. Receive the ReadLockDescriptor in TextureHost and close the file handle
4. Send a boolean flag in layer transactions if the texture is read locked instead of a descriptor
5. Use a boolean flag in TextureHost to determine if the ReadLock must be unlocked instead of a nullptr
I believe that we can remove the InitReadLocks code from LayerTransaction as that was added to
prevent file descriptor limits in IPDL messages and is no longer needed with this change. But
that is a non-essential change and this patch is already big enough.
MozReview-Commit-ID: DzHujrOQejH
--HG--
extra : rebase_source : 3bdd7c9bc8edfdc386faad8a9e59ad7dc18ed91d
78 lines
2.6 KiB
C++
78 lines
2.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#ifndef gfx_layers_ipc_VideoBridgeParent_h_
|
|
#define gfx_layers_ipc_VideoBridgeParent_h_
|
|
|
|
#include "mozilla/layers/PVideoBridgeParent.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
class CompositorThreadHolder;
|
|
|
|
class VideoBridgeParent final : public PVideoBridgeParent,
|
|
public HostIPCAllocator,
|
|
public ShmemAllocator
|
|
{
|
|
public:
|
|
VideoBridgeParent();
|
|
~VideoBridgeParent();
|
|
|
|
static VideoBridgeParent* GetSingleton();
|
|
TextureHost* LookupTexture(uint64_t aSerial);
|
|
|
|
// PVideoBridgeParent
|
|
void ActorDestroy(ActorDestroyReason aWhy) override;
|
|
PTextureParent* AllocPTextureParent(const SurfaceDescriptor& aSharedData,
|
|
const ReadLockDescriptor& aReadLock,
|
|
const LayersBackend& aLayersBackend,
|
|
const TextureFlags& aFlags,
|
|
const uint64_t& aSerial) override;
|
|
bool DeallocPTextureParent(PTextureParent* actor) override;
|
|
|
|
// HostIPCAllocator
|
|
base::ProcessId GetChildProcessId() override
|
|
{
|
|
return OtherPid();
|
|
}
|
|
void NotifyNotUsed(PTextureParent* aTexture, uint64_t aTransactionId) override;
|
|
void SendAsyncMessage(const InfallibleTArray<AsyncParentMessageData>& aMessage) override;
|
|
|
|
// ISurfaceAllocator
|
|
ShmemAllocator* AsShmemAllocator() override { return this; }
|
|
bool IsSameProcess() const override;
|
|
bool IPCOpen() const override { return !mClosed; }
|
|
|
|
// ShmemAllocator
|
|
bool AllocShmem(size_t aSize,
|
|
ipc::SharedMemory::SharedMemoryType aType,
|
|
ipc::Shmem* aShmem) override;
|
|
|
|
bool AllocUnsafeShmem(size_t aSize,
|
|
ipc::SharedMemory::SharedMemoryType aType,
|
|
ipc::Shmem* aShmem) override;
|
|
|
|
void DeallocShmem(ipc::Shmem& aShmem) override;
|
|
|
|
private:
|
|
void DeallocPVideoBridgeParent() override;
|
|
|
|
// This keeps us alive until ActorDestroy(), at which point we do a
|
|
// deferred destruction of ourselves.
|
|
RefPtr<VideoBridgeParent> mSelfRef;
|
|
RefPtr<CompositorThreadHolder> mCompositorThreadRef;
|
|
|
|
std::map<uint64_t, PTextureParent*> mTextureMap;
|
|
|
|
bool mClosed;
|
|
};
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|
|
|
|
#endif // gfx_layers_ipc_VideoBridgeParent_h_
|