wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 885804: Renaming in gfx r=nical

Browse Source
This commit is contained in:
David Zbarsky 2013-07-08 11:48:39 -04:00
parent b2b3004e5d
commit 1045c48c19
12 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/layers/ipc/CompositorChild.cpp
View File

@ -71,15 +71,15 @@ CompositorChild::Get()
}
PLayerTransactionChild*
CompositorChild::AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier*)
CompositorChild::AllocPLayerTransactionChild(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier*)
{
return new LayerTransactionChild();
}
bool
CompositorChild::DeallocPLayerTransaction(PLayerTransactionChild* actor)
CompositorChild::DeallocPLayerTransactionChild(PLayerTransactionChild* actor)
{
delete actor;
return true;

8
gfx/layers/ipc/CompositorChild.h
View File

@ -39,11 +39,11 @@ public:
static bool ChildProcessHasCompositor() { return sCompositor != nullptr; }
protected:
virtual PLayerTransactionChild*
AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
AllocPLayerTransactionChild(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransaction(PLayerTransactionChild *aChild) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransactionChild(PLayerTransactionChild *aChild) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;

24
gfx/layers/ipc/CompositorParent.cpp
View File

@ -563,9 +563,9 @@ CompositorParent::ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
}
PLayerTransactionParent*
CompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
CompositorParent::AllocPLayerTransactionParent(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
{
MOZ_ASSERT(aId == 0);
@ -608,7 +608,7 @@ CompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendHint,
}
bool
CompositorParent::DeallocPLayerTransaction(PLayerTransactionParent* actor)
CompositorParent::DeallocPLayerTransactionParent(PLayerTransactionParent* actor)
{
delete actor;
return true;
@ -758,11 +758,11 @@ public:
virtual bool RecvFlushRendering() MOZ_OVERRIDE { return true; }
virtual PLayerTransactionParent*
AllocPLayerTransaction(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
AllocPLayerTransactionParent(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransaction(PLayerTransactionParent* aLayers) MOZ_OVERRIDE;
virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers) MOZ_OVERRIDE;
virtual void ShadowLayersUpdated(LayerTransactionParent* aLayerTree,
const TargetConfig& aTargetConfig,
@ -845,9 +845,9 @@ CrossProcessCompositorParent::ActorDestroy(ActorDestroyReason aWhy)
}
PLayerTransactionParent*
CrossProcessCompositorParent::AllocPLayerTransaction(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
CrossProcessCompositorParent::AllocPLayerTransactionParent(const LayersBackend& aBackendType,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier)
{
MOZ_ASSERT(aId != 0);
@ -857,7 +857,7 @@ CrossProcessCompositorParent::AllocPLayerTransaction(const LayersBackend& aBacke
}
bool
CrossProcessCompositorParent::DeallocPLayerTransaction(PLayerTransactionParent* aLayers)
CrossProcessCompositorParent::DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers)
{
LayerTransactionParent* slp = static_cast<LayerTransactionParent*>(aLayers);
RemoveIndirectTree(slp->GetId());

8
gfx/layers/ipc/CompositorParent.h
View File

@ -173,10 +173,10 @@ public:
protected:
virtual PLayerTransactionParent*
AllocPLayerTransaction(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier);
virtual bool DeallocPLayerTransaction(PLayerTransactionParent* aLayers);
AllocPLayerTransactionParent(const LayersBackend& aBackendHint,
const uint64_t& aId,
TextureFactoryIdentifier* aTextureFactoryIdentifier);
virtual bool DeallocPLayerTransactionParent(PLayerTransactionParent* aLayers);
virtual void ScheduleTask(CancelableTask*, int);
virtual void Composite();
virtual void ComposeToTarget(gfxContext* aTarget);

10
gfx/layers/ipc/ImageBridgeChild.cpp
View File

@ -239,13 +239,13 @@ ImageBridgeChild::Connect(CompositableClient* aCompositable)
}
PCompositableChild*
ImageBridgeChild::AllocPCompositable(const TextureInfo& aInfo, uint64_t* aID)
ImageBridgeChild::AllocPCompositableChild(const TextureInfo& aInfo, uint64_t* aID)
{
return new CompositableChild();
}
bool
ImageBridgeChild::DeallocPCompositable(PCompositableChild* aActor)
ImageBridgeChild::DeallocPCompositableChild(PCompositableChild* aActor)
{
delete aActor;
return true;
@ -522,8 +522,8 @@ ImageBridgeChild::CreateImageClientNow(CompositableType aType)
}
PGrallocBufferChild*
ImageBridgeChild::AllocPGrallocBuffer(const gfxIntSize&, const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*)
ImageBridgeChild::AllocPGrallocBufferChild(const gfxIntSize&, const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
return GrallocBufferActor::Create();
@ -534,7 +534,7 @@ ImageBridgeChild::AllocPGrallocBuffer(const gfxIntSize&, const uint32_t&, const
}
bool
ImageBridgeChild::DeallocPGrallocBuffer(PGrallocBufferChild* actor)
ImageBridgeChild::DeallocPGrallocBufferChild(PGrallocBufferChild* actor)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
delete actor;

10
gfx/layers/ipc/ImageBridgeChild.h
View File

@ -167,8 +167,8 @@ public:
*/
MessageLoop * GetMessageLoop() const;
PCompositableChild* AllocPCompositable(const TextureInfo& aInfo, uint64_t* aID) MOZ_OVERRIDE;
bool DeallocPCompositable(PCompositableChild* aActor) MOZ_OVERRIDE;
PCompositableChild* AllocPCompositableChild(const TextureInfo& aInfo, uint64_t* aID) MOZ_OVERRIDE;
bool DeallocPCompositableChild(PCompositableChild* aActor) MOZ_OVERRIDE;
/**
* This must be called by the static function DeleteImageBridgeSync defined
@ -177,11 +177,11 @@ public:
~ImageBridgeChild();
virtual PGrallocBufferChild*
AllocPGrallocBuffer(const gfxIntSize&, const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*) MOZ_OVERRIDE;
AllocPGrallocBufferChild(const gfxIntSize&, const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*) MOZ_OVERRIDE;
virtual bool
DeallocPGrallocBuffer(PGrallocBufferChild* actor) MOZ_OVERRIDE;
DeallocPGrallocBufferChild(PGrallocBufferChild* actor) MOZ_OVERRIDE;
/**
* Allocate a gralloc SurfaceDescriptor remotely.

16
gfx/layers/ipc/ImageBridgeParent.cpp
View File

@ -114,10 +114,10 @@ static uint64_t GenImageContainerID() {
}
PGrallocBufferParent*
ImageBridgeParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
const uint32_t& aFormat,
const uint32_t& aUsage,
MaybeMagicGrallocBufferHandle* aOutHandle)
ImageBridgeParent::AllocPGrallocBufferParent(const gfxIntSize& aSize,
const uint32_t& aFormat,
const uint32_t& aUsage,
MaybeMagicGrallocBufferHandle* aOutHandle)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
return GrallocBufferActor::Create(aSize, aFormat, aUsage, aOutHandle);
@ -128,7 +128,7 @@ ImageBridgeParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
}
bool
ImageBridgeParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
ImageBridgeParent::DeallocPGrallocBufferParent(PGrallocBufferParent* actor)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
delete actor;
@ -140,15 +140,15 @@ ImageBridgeParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
}
PCompositableParent*
ImageBridgeParent::AllocPCompositable(const TextureInfo& aInfo,
uint64_t* aID)
ImageBridgeParent::AllocPCompositableParent(const TextureInfo& aInfo,
uint64_t* aID)
{
uint64_t id = GenImageContainerID();
*aID = id;
return new CompositableParent(this, aInfo, id);
}
bool ImageBridgeParent::DeallocPCompositable(PCompositableParent* aActor)
bool ImageBridgeParent::DeallocPCompositableParent(PCompositableParent* aActor)
{
delete aActor;
return true;

12
gfx/layers/ipc/ImageBridgeParent.h
View File

@ -35,19 +35,19 @@ public:
Create(Transport* aTransport, ProcessId aOtherProcess);
virtual PGrallocBufferParent*
AllocPGrallocBuffer(const gfxIntSize&, const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*) MOZ_OVERRIDE;
AllocPGrallocBufferParent(const gfxIntSize&, const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*) MOZ_OVERRIDE;
virtual bool
DeallocPGrallocBuffer(PGrallocBufferParent* actor) MOZ_OVERRIDE;
DeallocPGrallocBufferParent(PGrallocBufferParent* actor) MOZ_OVERRIDE;
// PImageBridge
virtual bool RecvUpdate(const EditArray& aEdits, EditReplyArray* aReply);
virtual bool RecvUpdateNoSwap(const EditArray& aEdits);
PCompositableParent* AllocPCompositable(const TextureInfo& aInfo,
uint64_t*) MOZ_OVERRIDE;
bool DeallocPCompositable(PCompositableParent* aActor) MOZ_OVERRIDE;
PCompositableParent* AllocPCompositableParent(const TextureInfo& aInfo,
uint64_t*) MOZ_OVERRIDE;
bool DeallocPCompositableParent(PCompositableParent* aActor) MOZ_OVERRIDE;
bool RecvStop() MOZ_OVERRIDE;

12
gfx/layers/ipc/LayerTransactionChild.cpp
View File

@ -23,7 +23,7 @@ LayerTransactionChild::Destroy()
}
PGrallocBufferChild*
LayerTransactionChild::AllocPGrallocBuffer(const gfxIntSize&,
LayerTransactionChild::AllocPGrallocBufferChild(const gfxIntSize&,
const uint32_t&,
const uint32_t&,
MaybeMagicGrallocBufferHandle*)
@ -37,7 +37,7 @@ LayerTransactionChild::AllocPGrallocBuffer(const gfxIntSize&,
}
bool
LayerTransactionChild::DeallocPGrallocBuffer(PGrallocBufferChild* actor)
LayerTransactionChild::DeallocPGrallocBufferChild(PGrallocBufferChild* actor)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
delete actor;
@ -49,7 +49,7 @@ LayerTransactionChild::DeallocPGrallocBuffer(PGrallocBufferChild* actor)
}
PLayerChild*
LayerTransactionChild::AllocPLayer()
LayerTransactionChild::AllocPLayerChild()
{
// we always use the "power-user" ctor
NS_RUNTIMEABORT("not reached");
@ -57,20 +57,20 @@ LayerTransactionChild::AllocPLayer()
}
bool
LayerTransactionChild::DeallocPLayer(PLayerChild* actor)
LayerTransactionChild::DeallocPLayerChild(PLayerChild* actor)
{
delete actor;
return true;
}
PCompositableChild*
LayerTransactionChild::AllocPCompositable(const TextureInfo& aInfo)
LayerTransactionChild::AllocPCompositableChild(const TextureInfo& aInfo)
{
return new CompositableChild();
}
bool
LayerTransactionChild::DeallocPCompositable(PCompositableChild* actor)
LayerTransactionChild::DeallocPCompositableChild(PCompositableChild* actor)
{
delete actor;
return true;

12
gfx/layers/ipc/LayerTransactionChild.h
View File

@ -30,17 +30,17 @@ public:
protected:
virtual PGrallocBufferChild*
AllocPGrallocBuffer(const gfxIntSize&,
AllocPGrallocBufferChild(const gfxIntSize&,
const uint32_t&, const uint32_t&,
MaybeMagicGrallocBufferHandle*) MOZ_OVERRIDE;
virtual bool
DeallocPGrallocBuffer(PGrallocBufferChild* actor) MOZ_OVERRIDE;
DeallocPGrallocBufferChild(PGrallocBufferChild* actor) MOZ_OVERRIDE;
virtual PLayerChild* AllocPLayer() MOZ_OVERRIDE;
virtual bool DeallocPLayer(PLayerChild* actor) MOZ_OVERRIDE;
virtual PLayerChild* AllocPLayerChild() MOZ_OVERRIDE;
virtual bool DeallocPLayerChild(PLayerChild* actor) MOZ_OVERRIDE;
virtual PCompositableChild* AllocPCompositable(const TextureInfo& aInfo) MOZ_OVERRIDE;
virtual bool DeallocPCompositable(PCompositableChild* actor) MOZ_OVERRIDE;
virtual PCompositableChild* AllocPCompositableChild(const TextureInfo& aInfo) MOZ_OVERRIDE;
virtual bool DeallocPCompositableChild(PCompositableChild* actor) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
};

12
gfx/layers/ipc/LayerTransactionParent.cpp
View File

@ -514,7 +514,7 @@ LayerTransactionParent::RecvClearCachedResources()
}
PGrallocBufferParent*
LayerTransactionParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
LayerTransactionParent::AllocPGrallocBufferParent(const gfxIntSize& aSize,
const uint32_t& aFormat,
const uint32_t& aUsage,
MaybeMagicGrallocBufferHandle* aOutHandle)
@ -528,7 +528,7 @@ LayerTransactionParent::AllocPGrallocBuffer(const gfxIntSize& aSize,
}
bool
LayerTransactionParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
LayerTransactionParent::DeallocPGrallocBufferParent(PGrallocBufferParent* actor)
{
#ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
delete actor;
@ -540,26 +540,26 @@ LayerTransactionParent::DeallocPGrallocBuffer(PGrallocBufferParent* actor)
}
PLayerParent*
LayerTransactionParent::AllocPLayer()
LayerTransactionParent::AllocPLayerParent()
{
return new ShadowLayerParent();
}
bool
LayerTransactionParent::DeallocPLayer(PLayerParent* actor)
LayerTransactionParent::DeallocPLayerParent(PLayerParent* actor)
{
delete actor;
return true;
}
PCompositableParent*
LayerTransactionParent::AllocPCompositable(const TextureInfo& aInfo)
LayerTransactionParent::AllocPCompositableParent(const TextureInfo& aInfo)
{
return new CompositableParent(this, aInfo);
}
bool
LayerTransactionParent::DeallocPCompositable(PCompositableParent* actor)
LayerTransactionParent::DeallocPCompositableParent(PCompositableParent* actor)
{
delete actor;
return true;

12
gfx/layers/ipc/LayerTransactionParent.h
View File

@ -82,17 +82,17 @@ protected:
gfx3DMatrix* aTransform) MOZ_OVERRIDE;
virtual PGrallocBufferParent*
AllocPGrallocBuffer(const gfxIntSize& aSize,
AllocPGrallocBufferParent(const gfxIntSize& aSize,
const uint32_t& aFormat, const uint32_t& aUsage,
MaybeMagicGrallocBufferHandle* aOutHandle) MOZ_OVERRIDE;
virtual bool
DeallocPGrallocBuffer(PGrallocBufferParent* actor) MOZ_OVERRIDE;
DeallocPGrallocBufferParent(PGrallocBufferParent* actor) MOZ_OVERRIDE;
virtual PLayerParent* AllocPLayer() MOZ_OVERRIDE;
virtual bool DeallocPLayer(PLayerParent* actor) MOZ_OVERRIDE;
virtual PLayerParent* AllocPLayerParent() MOZ_OVERRIDE;
virtual bool DeallocPLayerParent(PLayerParent* actor) MOZ_OVERRIDE;
virtual PCompositableParent* AllocPCompositable(const TextureInfo& aInfo) MOZ_OVERRIDE;
virtual bool DeallocPCompositable(PCompositableParent* actor) MOZ_OVERRIDE;
virtual PCompositableParent* AllocPCompositableParent(const TextureInfo& aInfo) MOZ_OVERRIDE;
virtual bool DeallocPCompositableParent(PCompositableParent* actor) MOZ_OVERRIDE;
void Attach(ShadowLayerParent* aLayerParent, CompositableParent* aCompositable);