Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-22 12:04:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 893301. Renaming and indentation fixes. r=nical

Browse Source
This commit is contained in:
Nicholas Cameron 2013-11-28 10:16:35 +13:00
parent 54312ee7d4
commit 5e6740776c
6 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
gfx/layers/client/ContentClient.cpp
View File

@ -63,9 +63,9 @@ ContentClient::CreateContentClient(CompositableForwarder* aForwarder)
if (useDoubleBuffering || PR_GetEnv("MOZ_FORCE_DOUBLE_BUFFERING")) {
if (gfxPlatform::GetPlatform()->UseDeprecatedTextures()) {
return new ContentClientDoubleBuffered(aForwarder);
return new DeprecatedContentClientDoubleBuffered(aForwarder);
} else {
return new ContentClientDoubleBufferedNew(aForwarder);
return new ContentClientDoubleBuffered(aForwarder);
}
}
#ifdef XP_MACOSX
@ -74,9 +74,9 @@ ContentClient::CreateContentClient(CompositableForwarder* aForwarder)
}
#endif
if (gfxPlatform::GetPlatform()->UseDeprecatedTextures()) {
return new ContentClientSingleBuffered(aForwarder);
return new DeprecatedContentClientSingleBuffered(aForwarder);
} else {
return new ContentClientSingleBufferedNew(aForwarder);
return new ContentClientSingleBuffered(aForwarder);
}
}
@ -105,7 +105,7 @@ ContentClientBasic::CreateBuffer(ContentType aType,
}
void
ContentClientRemoteBufferNew::DestroyBuffers()
ContentClientRemoteBuffer::DestroyBuffers()
{
if (!mTextureClient) {
return;
@ -123,7 +123,7 @@ ContentClientRemoteBufferNew::DestroyBuffers()
}
void
ContentClientRemoteBufferNew::BeginPaint()
ContentClientRemoteBuffer::BeginPaint()
{
// XXX: So we might not have a DeprecatedTextureClient yet.. because it will
// only be created by CreateBuffer.. which will deliver a locked surface!.
@ -136,7 +136,7 @@ ContentClientRemoteBufferNew::BeginPaint()
}
void
ContentClientRemoteBufferNew::EndPaint()
ContentClientRemoteBuffer::EndPaint()
{
// XXX: We might still not have a texture client if PaintThebes
// decided we didn't need one yet because the region to draw was empty.
@ -156,8 +156,8 @@ ContentClientRemoteBufferNew::EndPaint()
}
bool
ContentClientRemoteBufferNew::CreateAndAllocateTextureClient(RefPtr<TextureClient>& aClient,
TextureFlags aFlags)
ContentClientRemoteBuffer::CreateAndAllocateTextureClient(RefPtr<TextureClient>& aClient,
TextureFlags aFlags)
{
aClient = CreateTextureClientForDrawing(mSurfaceFormat,
mTextureInfo.mTextureFlags | aFlags);
@ -183,9 +183,9 @@ ContentClientRemoteBufferNew::CreateAndAllocateTextureClient(RefPtr<TextureClien
}
void
ContentClientRemoteBufferNew::BuildTextureClients(SurfaceFormat aFormat,
const nsIntRect& aRect,
uint32_t aFlags)
ContentClientRemoteBuffer::BuildTextureClients(SurfaceFormat aFormat,
const nsIntRect& aRect,
uint32_t aFlags)
{
// If we hit this assertion, then it might be due to an empty transaction
// followed by a real transaction. Our buffers should be created (but not
@ -224,7 +224,7 @@ ContentClientRemoteBufferNew::BuildTextureClients(SurfaceFormat aFormat,
}
void
ContentClientRemoteBufferNew::CreateBuffer(ContentType aType,
ContentClientRemoteBuffer::CreateBuffer(ContentType aType,
const nsIntRect& aRect,
uint32_t aFlags,
RefPtr<gfx::DrawTarget>* aBlackDT,
@ -242,7 +242,7 @@ ContentClientRemoteBufferNew::CreateBuffer(ContentType aType,
}
nsIntRegion
ContentClientRemoteBufferNew::GetUpdatedRegion(const nsIntRegion& aRegionToDraw,
ContentClientRemoteBuffer::GetUpdatedRegion(const nsIntRegion& aRegionToDraw,
const nsIntRegion& aVisibleRegion,
bool aDidSelfCopy)
{
@ -269,7 +269,7 @@ ContentClientRemoteBufferNew::GetUpdatedRegion(const nsIntRegion& aRegionToDraw,
}
void
ContentClientRemoteBufferNew::Updated(const nsIntRegion& aRegionToDraw,
ContentClientRemoteBuffer::Updated(const nsIntRegion& aRegionToDraw,
const nsIntRegion& aVisibleRegion,
bool aDidSelfCopy)
{
@ -291,7 +291,7 @@ ContentClientRemoteBufferNew::Updated(const nsIntRegion& aRegionToDraw,
}
void
ContentClientRemoteBufferNew::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
ContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
{
MOZ_ASSERT(mTextureClient->GetAccessMode() == TextureClient::ACCESS_NONE);
MOZ_ASSERT(!mTextureClientOnWhite || mTextureClientOnWhite->GetAccessMode() == TextureClient::ACCESS_NONE);
@ -305,7 +305,7 @@ ContentClientRemoteBufferNew::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion
}
void
ContentClientRemoteBuffer::DestroyBuffers()
DeprecatedContentClientRemoteBuffer::DestroyBuffers()
{
if (!mDeprecatedTextureClient) {
return;
@ -321,7 +321,7 @@ ContentClientRemoteBuffer::DestroyBuffers()
}
void
ContentClientRemoteBuffer::BeginPaint()
DeprecatedContentClientRemoteBuffer::BeginPaint()
{
// XXX: So we might not have a DeprecatedTextureClient yet.. because it will
// only be created by CreateBuffer.. which will deliver a locked surface!.
@ -334,7 +334,7 @@ ContentClientRemoteBuffer::BeginPaint()
}
void
ContentClientRemoteBuffer::EndPaint()
DeprecatedContentClientRemoteBuffer::EndPaint()
{
// XXX: We might still not have a texture client if PaintThebes
// decided we didn't need one yet because the region to draw was empty.
@ -351,7 +351,7 @@ ContentClientRemoteBuffer::EndPaint()
}
bool
ContentClientRemoteBuffer::CreateAndAllocateDeprecatedTextureClient(RefPtr<DeprecatedTextureClient>& aClient)
DeprecatedContentClientRemoteBuffer::CreateAndAllocateDeprecatedTextureClient(RefPtr<DeprecatedTextureClient>& aClient)
{
aClient = CreateDeprecatedTextureClient(TEXTURE_CONTENT, mContentType);
MOZ_ASSERT(aClient, "Failed to create texture client");
@ -372,7 +372,7 @@ ContentClientRemoteBuffer::CreateAndAllocateDeprecatedTextureClient(RefPtr<Depre
}
void
ContentClientRemoteBuffer::BuildDeprecatedTextureClients(ContentType aType,
DeprecatedContentClientRemoteBuffer::BuildDeprecatedTextureClients(ContentType aType,
const nsIntRect& aRect,
uint32_t aFlags)
{
@ -409,7 +409,7 @@ ContentClientRemoteBuffer::BuildDeprecatedTextureClients(ContentType aType,
}
void
ContentClientRemoteBuffer::CreateBuffer(ContentType aType,
DeprecatedContentClientRemoteBuffer::CreateBuffer(ContentType aType,
const nsIntRect& aRect,
uint32_t aFlags,
RefPtr<gfx::DrawTarget>* aBlackDT,
@ -429,7 +429,7 @@ ContentClientRemoteBuffer::CreateBuffer(ContentType aType,
}
nsIntRegion
ContentClientRemoteBuffer::GetUpdatedRegion(const nsIntRegion& aRegionToDraw,
DeprecatedContentClientRemoteBuffer::GetUpdatedRegion(const nsIntRegion& aRegionToDraw,
const nsIntRegion& aVisibleRegion,
bool aDidSelfCopy)
{
@ -456,7 +456,7 @@ ContentClientRemoteBuffer::GetUpdatedRegion(const nsIntRegion& aRegionToDraw,
}
void
ContentClientRemoteBuffer::Updated(const nsIntRegion& aRegionToDraw,
DeprecatedContentClientRemoteBuffer::Updated(const nsIntRegion& aRegionToDraw,
const nsIntRegion& aVisibleRegion,
bool aDidSelfCopy)
{
@ -477,7 +477,7 @@ ContentClientRemoteBuffer::Updated(const nsIntRegion& aRegionToDraw,
}
void
ContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
DeprecatedContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
{
MOZ_ASSERT(mDeprecatedTextureClient->GetAccessMode() == DeprecatedTextureClient::ACCESS_NONE);
MOZ_ASSERT(!mDeprecatedTextureClientOnWhite || mDeprecatedTextureClientOnWhite->GetAccessMode() == DeprecatedTextureClient::ACCESS_NONE);
@ -492,7 +492,7 @@ ContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
void
ContentClientRemoteBuffer::OnActorDestroy()
DeprecatedContentClientRemoteBuffer::OnActorDestroy()
{
if (mDeprecatedTextureClient) {
mDeprecatedTextureClient->OnActorDestroy();
@ -506,7 +506,7 @@ ContentClientRemoteBuffer::OnActorDestroy()
}
void
ContentClientDoubleBufferedNew::CreateFrontBuffer(const nsIntRect& aBufferRect)
ContentClientDoubleBuffered::CreateFrontBuffer(const nsIntRect& aBufferRect)
{
if (!CreateAndAllocateTextureClient(mFrontClient, TEXTURE_ON_BLACK) ||
!AddTextureClient(mFrontClient)) {
@ -526,7 +526,7 @@ ContentClientDoubleBufferedNew::CreateFrontBuffer(const nsIntRect& aBufferRect)
}
void
ContentClientDoubleBufferedNew::DestroyFrontBuffer()
ContentClientDoubleBuffered::DestroyFrontBuffer()
{
MOZ_ASSERT(mFrontClient);
MOZ_ASSERT(mFrontClient->GetAccessMode() != TextureClient::ACCESS_NONE);
@ -540,7 +540,7 @@ ContentClientDoubleBufferedNew::DestroyFrontBuffer()
}
void
ContentClientDoubleBufferedNew::LockFrontBuffer()
ContentClientDoubleBuffered::LockFrontBuffer()
{
MOZ_ASSERT(mFrontClient);
mFrontClient->SetAccessMode(TextureClient::ACCESS_NONE);
@ -550,7 +550,7 @@ ContentClientDoubleBufferedNew::LockFrontBuffer()
}
void
ContentClientDoubleBufferedNew::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
ContentClientDoubleBuffered::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
{
mFrontUpdatedRegion = aFrontUpdatedRegion;
@ -576,11 +576,11 @@ ContentClientDoubleBufferedNew::SwapBuffers(const nsIntRegion& aFrontUpdatedRegi
mFrontClientOnWhite->SetAccessMode(TextureClient::ACCESS_READ_ONLY);
}
ContentClientRemoteBufferNew::SwapBuffers(aFrontUpdatedRegion);
ContentClientRemoteBuffer::SwapBuffers(aFrontUpdatedRegion);
}
void
ContentClientDoubleBufferedNew::SyncFrontBufferToBackBuffer()
ContentClientDoubleBuffered::SyncFrontBufferToBackBuffer()
{
if (!mFrontAndBackBufferDiffer) {
return;
@ -648,7 +648,7 @@ ContentClientDoubleBufferedNew::SyncFrontBufferToBackBuffer()
}
void
ContentClientDoubleBufferedNew::UpdateDestinationFrom(const RotatedBuffer& aSource,
ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
const nsIntRegion& aUpdateRegion)
{
nsRefPtr<gfxContext> destCtx =
@ -677,7 +677,7 @@ ContentClientDoubleBufferedNew::UpdateDestinationFrom(const RotatedBuffer& aSour
}
}
ContentClientDoubleBuffered::~ContentClientDoubleBuffered()
DeprecatedContentClientDoubleBuffered::~DeprecatedContentClientDoubleBuffered()
{
if (mDeprecatedTextureClient) {
MOZ_ASSERT(mFrontClient);
@ -692,7 +692,7 @@ ContentClientDoubleBuffered::~ContentClientDoubleBuffered()
}
void
ContentClientDoubleBuffered::CreateFrontBufferAndNotify(const nsIntRect& aBufferRect)
DeprecatedContentClientDoubleBuffered::CreateFrontBufferAndNotify(const nsIntRect& aBufferRect)
{
if (!CreateAndAllocateDeprecatedTextureClient(mFrontClient)) {
mDeprecatedTextureClient->SetFlags(0);
@ -728,7 +728,7 @@ ContentClientDoubleBuffered::CreateFrontBufferAndNotify(const nsIntRect& aBuffer
}
void
ContentClientDoubleBuffered::DestroyFrontBuffer()
DeprecatedContentClientDoubleBuffered::DestroyFrontBuffer()
{
MOZ_ASSERT(mFrontClient);
MOZ_ASSERT(mFrontClient->GetAccessMode() != DeprecatedTextureClient::ACCESS_NONE);
@ -738,7 +738,7 @@ ContentClientDoubleBuffered::DestroyFrontBuffer()
}
void
ContentClientDoubleBuffered::LockFrontBuffer()
DeprecatedContentClientDoubleBuffered::LockFrontBuffer()
{
MOZ_ASSERT(mFrontClient);
mFrontClient->SetAccessMode(DeprecatedTextureClient::ACCESS_NONE);
@ -748,7 +748,7 @@ ContentClientDoubleBuffered::LockFrontBuffer()
}
void
ContentClientDoubleBuffered::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
DeprecatedContentClientDoubleBuffered::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
{
mFrontUpdatedRegion = aFrontUpdatedRegion;
@ -774,11 +774,11 @@ ContentClientDoubleBuffered::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
mFrontClientOnWhite->SetAccessMode(DeprecatedTextureClient::ACCESS_READ_ONLY);
}
ContentClientRemoteBuffer::SwapBuffers(aFrontUpdatedRegion);
DeprecatedContentClientRemoteBuffer::SwapBuffers(aFrontUpdatedRegion);
}
void
ContentClientDoubleBuffered::OnActorDestroy()
DeprecatedContentClientDoubleBuffered::OnActorDestroy()
{
if (mDeprecatedTextureClient) {
mDeprecatedTextureClient->OnActorDestroy();
@ -821,7 +821,7 @@ private:
};
void
ContentClientDoubleBuffered::SyncFrontBufferToBackBuffer()
DeprecatedContentClientDoubleBuffered::SyncFrontBufferToBackBuffer()
{
mIsNewBuffer = false;
@ -877,7 +877,7 @@ ContentClientDoubleBuffered::SyncFrontBufferToBackBuffer()
}
void
ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
DeprecatedContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
const nsIntRegion& aUpdateRegion)
{
nsRefPtr<gfxContext> destCtx =
@ -910,7 +910,7 @@ ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
}
void
ContentClientSingleBufferedNew::SyncFrontBufferToBackBuffer()
ContentClientSingleBuffered::SyncFrontBufferToBackBuffer()
{
if (!mFrontAndBackBufferDiffer) {
return;
@ -937,7 +937,7 @@ ContentClientSingleBufferedNew::SyncFrontBufferToBackBuffer()
mFrontAndBackBufferDiffer = false;
}
ContentClientSingleBuffered::~ContentClientSingleBuffered()
DeprecatedContentClientSingleBuffered::~DeprecatedContentClientSingleBuffered()
{
if (mDeprecatedTextureClient) {
mDeprecatedTextureClient->SetDescriptor(SurfaceDescriptor());
@ -948,7 +948,7 @@ ContentClientSingleBuffered::~ContentClientSingleBuffered()
}
void
ContentClientSingleBuffered::CreateFrontBufferAndNotify(const nsIntRect& aBufferRect)
DeprecatedContentClientSingleBuffered::CreateFrontBufferAndNotify(const nsIntRect& aBufferRect)
{
mForwarder->CreatedSingleBuffer(this,
*mDeprecatedTextureClient->LockSurfaceDescriptor(),
@ -957,7 +957,7 @@ ContentClientSingleBuffered::CreateFrontBufferAndNotify(const nsIntRect& aBuffer
}
void
ContentClientSingleBuffered::SyncFrontBufferToBackBuffer()
DeprecatedContentClientSingleBuffered::SyncFrontBufferToBackBuffer()
{
mIsNewBuffer = false;
if (!mFrontAndBackBufferDiffer) {

44
gfx/layers/client/ContentClient.h
View File

@ -183,13 +183,13 @@ private:
* create them.
*/
// Version using new texture clients
class ContentClientRemoteBufferNew : public ContentClientRemote
, protected RotatedContentBuffer
class ContentClientRemoteBuffer : public ContentClientRemote
, protected RotatedContentBuffer
{
using RotatedContentBuffer::BufferRect;
using RotatedContentBuffer::BufferRotation;
public:
ContentClientRemoteBufferNew(CompositableForwarder* aForwarder)
ContentClientRemoteBuffer(CompositableForwarder* aForwarder)
: ContentClientRemote(aForwarder)
, RotatedContentBuffer(ContainsVisibleBounds)
, mIsNewBuffer(false)
@ -285,13 +285,13 @@ protected:
gfx::SurfaceFormat mSurfaceFormat;
};
class ContentClientRemoteBuffer : public ContentClientRemote
, protected RotatedContentBuffer
class DeprecatedContentClientRemoteBuffer : public ContentClientRemote
, protected RotatedContentBuffer
{
using RotatedContentBuffer::BufferRect;
using RotatedContentBuffer::BufferRotation;
public:
ContentClientRemoteBuffer(CompositableForwarder* aForwarder)
DeprecatedContentClientRemoteBuffer(CompositableForwarder* aForwarder)
: ContentClientRemote(aForwarder)
, RotatedContentBuffer(ContainsVisibleBounds)
, mDeprecatedTextureClient(nullptr)
@ -393,15 +393,15 @@ protected:
* references. In response to the compositor's reply we swap our references
* (in SwapBuffers).
*/
class ContentClientDoubleBufferedNew : public ContentClientRemoteBufferNew
class ContentClientDoubleBuffered : public ContentClientRemoteBuffer
{
public:
ContentClientDoubleBufferedNew(CompositableForwarder* aFwd)
: ContentClientRemoteBufferNew(aFwd)
ContentClientDoubleBuffered(CompositableForwarder* aFwd)
: ContentClientRemoteBuffer(aFwd)
{
mTextureInfo.mCompositableType = COMPOSITABLE_CONTENT_DOUBLE;
}
virtual ~ContentClientDoubleBufferedNew() {}
virtual ~ContentClientDoubleBuffered() {}
virtual void SwapBuffers(const nsIntRegion& aFrontUpdatedRegion) MOZ_OVERRIDE;
@ -431,15 +431,15 @@ private:
nsIntPoint mFrontBufferRotation;
};
class ContentClientDoubleBuffered : public ContentClientRemoteBuffer
class DeprecatedContentClientDoubleBuffered : public DeprecatedContentClientRemoteBuffer
{
public:
ContentClientDoubleBuffered(CompositableForwarder* aFwd)
: ContentClientRemoteBuffer(aFwd)
DeprecatedContentClientDoubleBuffered(CompositableForwarder* aFwd)
: DeprecatedContentClientRemoteBuffer(aFwd)
{
mTextureInfo.mCompositableType = BUFFER_CONTENT_DIRECT;
}
~ContentClientDoubleBuffered();
~DeprecatedContentClientDoubleBuffered();
virtual void SwapBuffers(const nsIntRegion& aFrontUpdatedRegion) MOZ_OVERRIDE;
@ -471,15 +471,15 @@ private:
* kind. We are free to modify the TextureClient once we receive reply from
* the compositor.
*/
class ContentClientSingleBufferedNew : public ContentClientRemoteBufferNew
class ContentClientSingleBuffered : public ContentClientRemoteBuffer
{
public:
ContentClientSingleBufferedNew(CompositableForwarder* aFwd)
: ContentClientRemoteBufferNew(aFwd)
ContentClientSingleBuffered(CompositableForwarder* aFwd)
: ContentClientRemoteBuffer(aFwd)
{
mTextureInfo.mCompositableType = COMPOSITABLE_CONTENT_SINGLE;
}
virtual ~ContentClientSingleBufferedNew() {}
virtual ~ContentClientSingleBuffered() {}
virtual void SyncFrontBufferToBackBuffer() MOZ_OVERRIDE;
@ -487,15 +487,15 @@ protected:
virtual void CreateFrontBuffer(const nsIntRect& aBufferRect) MOZ_OVERRIDE {}
};
class ContentClientSingleBuffered : public ContentClientRemoteBuffer
class DeprecatedContentClientSingleBuffered : public DeprecatedContentClientRemoteBuffer
{
public:
ContentClientSingleBuffered(CompositableForwarder* aFwd)
: ContentClientRemoteBuffer(aFwd)
DeprecatedContentClientSingleBuffered(CompositableForwarder* aFwd)
: DeprecatedContentClientRemoteBuffer(aFwd)
{
mTextureInfo.mCompositableType = BUFFER_CONTENT;
}
~ContentClientSingleBuffered();
~DeprecatedContentClientSingleBuffered();
virtual void SyncFrontBufferToBackBuffer() MOZ_OVERRIDE;

8
gfx/layers/composite/CompositableHost.cpp
View File

@ -183,10 +183,10 @@ CompositableHost::Create(const TextureInfo& aTextureInfo)
MOZ_CRASH("Cannot create an image bridge compositable this way");
break;
case BUFFER_CONTENT:
result = new ContentHostSingleBuffered(aTextureInfo);
result = new DeprecatedContentHostSingleBuffered(aTextureInfo);
break;
case BUFFER_CONTENT_DIRECT:
result = new ContentHostDoubleBuffered(aTextureInfo);
result = new DeprecatedContentHostDoubleBuffered(aTextureInfo);
break;
case BUFFER_CONTENT_INC:
result = new ContentHostIncremental(aTextureInfo);
@ -198,10 +198,10 @@ CompositableHost::Create(const TextureInfo& aTextureInfo)
result = new ImageHost(aTextureInfo);
break;
case COMPOSITABLE_CONTENT_SINGLE:
result = new ContentHostSingleBufferedNew(aTextureInfo);
result = new ContentHostSingleBuffered(aTextureInfo);
break;
case COMPOSITABLE_CONTENT_DOUBLE:
result = new ContentHostDoubleBufferedNew(aTextureInfo);
result = new ContentHostDoubleBuffered(aTextureInfo);
break;
default:
MOZ_CRASH("Unknown CompositableType");

82
gfx/layers/composite/ContentHost.cpp
View File

@ -26,26 +26,26 @@ using namespace gfx;
namespace layers {
ContentHostBaseNew::ContentHostBaseNew(const TextureInfo& aTextureInfo)
ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo)
: ContentHost(aTextureInfo)
, mPaintWillResample(false)
, mInitialised(false)
{}
ContentHostBaseNew::~ContentHostBaseNew()
ContentHostBase::~ContentHostBase()
{
DestroyTextureHost();
DestroyTextureHostOnWhite();
}
TextureHost*
ContentHostBaseNew::GetAsTextureHost()
ContentHostBase::GetAsTextureHost()
{
return mTextureHost;
}
void
ContentHostBaseNew::DestroyTextureHost()
ContentHostBase::DestroyTextureHost()
{
// The third clause in the if statement checks that we are in fact done with
// this texture. We don't want to prematurely deallocate a texture we might
@ -64,7 +64,7 @@ ContentHostBaseNew::DestroyTextureHost()
}
void
ContentHostBaseNew::DestroyTextureHostOnWhite()
ContentHostBase::DestroyTextureHostOnWhite()
{
if (mTextureHostOnWhite &&
mTextureHostOnWhite->GetFlags() & TEXTURE_DEALLOCATE_DEFERRED &&
@ -76,7 +76,7 @@ ContentHostBaseNew::DestroyTextureHostOnWhite()
}
void
ContentHostBaseNew::RemoveTextureHost(TextureHost* aTexture)
ContentHostBase::RemoveTextureHost(TextureHost* aTexture)
{
if ((aTexture->GetFlags() & TEXTURE_DEALLOCATE_DEFERRED) &&
!(mTextureHost && mTextureHost == aTexture) &&
@ -115,7 +115,7 @@ private:
};
void
ContentHostBaseNew::Composite(EffectChain& aEffectChain,
ContentHostBase::Composite(EffectChain& aEffectChain,
float aOpacity,
const gfx::Matrix4x4& aTransform,
const Filter& aFilter,
@ -285,7 +285,7 @@ ContentHostBaseNew::Composite(EffectChain& aEffectChain,
void
ContentHostBaseNew::UseTextureHost(TextureHost* aTexture)
ContentHostBase::UseTextureHost(TextureHost* aTexture)
{
if (aTexture->GetFlags() & TEXTURE_ON_WHITE) {
DestroyTextureHost();
@ -297,7 +297,7 @@ ContentHostBaseNew::UseTextureHost(TextureHost* aTexture)
}
void
ContentHostBaseNew::SetCompositor(Compositor* aCompositor)
ContentHostBase::SetCompositor(Compositor* aCompositor)
{
CompositableHost::SetCompositor(aCompositor);
if (mTextureHost) {
@ -310,7 +310,7 @@ ContentHostBaseNew::SetCompositor(Compositor* aCompositor)
#ifdef MOZ_DUMP_PAINTING
void
ContentHostBaseNew::Dump(FILE* aFile,
ContentHostBase::Dump(FILE* aFile,
const char* aPrefix,
bool aDumpHtml)
{
@ -337,23 +337,23 @@ ContentHostBaseNew::Dump(FILE* aFile,
}
#endif
ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo)
DeprecatedContentHostBase::DeprecatedContentHostBase(const TextureInfo& aTextureInfo)
: ContentHost(aTextureInfo)
, mPaintWillResample(false)
, mInitialised(false)
{}
ContentHostBase::~ContentHostBase()
DeprecatedContentHostBase::~DeprecatedContentHostBase()
{}
DeprecatedTextureHost*
ContentHostBase::GetDeprecatedTextureHost()
DeprecatedContentHostBase::GetDeprecatedTextureHost()
{
return mDeprecatedTextureHost;
}
void
ContentHostBase::DestroyFrontHost()
DeprecatedContentHostBase::DestroyFrontHost()
{
MOZ_ASSERT(!mDeprecatedTextureHost || mDeprecatedTextureHost->GetDeAllocator(),
"We won't be able to destroy our SurfaceDescriptor");
@ -364,7 +364,7 @@ ContentHostBase::DestroyFrontHost()
}
void
ContentHostBase::OnActorDestroy()
DeprecatedContentHostBase::OnActorDestroy()
{
if (mDeprecatedTextureHost) {
mDeprecatedTextureHost->OnActorDestroy();
@ -381,7 +381,7 @@ ContentHostBase::OnActorDestroy()
}
void
ContentHostBase::Composite(EffectChain& aEffectChain,
DeprecatedContentHostBase::Composite(EffectChain& aEffectChain,
float aOpacity,
const gfx::Matrix4x4& aTransform,
const Filter& aFilter,
@ -547,7 +547,7 @@ ContentHostBase::Composite(EffectChain& aEffectChain,
}
void
ContentHostBase::SetCompositor(Compositor* aCompositor)
DeprecatedContentHostBase::SetCompositor(Compositor* aCompositor)
{
CompositableHost::SetCompositor(aCompositor);
if (mDeprecatedTextureHost) {
@ -561,7 +561,7 @@ ContentHostBase::SetCompositor(Compositor* aCompositor)
#ifdef MOZ_DUMP_PAINTING
void
ContentHostBase::Dump(FILE* aFile,
DeprecatedContentHostBase::Dump(FILE* aFile,
const char* aPrefix,
bool aDumpHtml)
{
@ -590,7 +590,7 @@ ContentHostBase::Dump(FILE* aFile,
#endif
void
ContentHostSingleBufferedNew::UpdateThebes(const ThebesBufferData& aData,
ContentHostSingleBuffered::UpdateThebes(const ThebesBufferData& aData,
const nsIntRegion& aUpdated,
const nsIntRegion& aOldValidRegionBack,
nsIntRegion* aUpdatedRegionBack)
@ -631,14 +631,14 @@ ContentHostSingleBufferedNew::UpdateThebes(const ThebesBufferData& aData,
mBufferRotation = aData.rotation();
}
ContentHostSingleBuffered::~ContentHostSingleBuffered()
DeprecatedContentHostSingleBuffered::~DeprecatedContentHostSingleBuffered()
{
DestroyTextures();
DestroyFrontHost();
}
void
ContentHostSingleBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextureId,
DeprecatedContentHostSingleBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextureId,
const SurfaceDescriptor& aSurface,
ISurfaceAllocator* aAllocator,
const TextureInfo& aTextureInfo)
@ -661,7 +661,7 @@ ContentHostSingleBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextur
}
void
ContentHostSingleBuffered::DestroyTextures()
DeprecatedContentHostSingleBuffered::DestroyTextures()
{
MOZ_ASSERT(!mNewFrontHost || mNewFrontHost->GetDeAllocator(),
"We won't be able to destroy our SurfaceDescriptor");
@ -674,7 +674,7 @@ ContentHostSingleBuffered::DestroyTextures()
}
void
ContentHostSingleBuffered::UpdateThebes(const ThebesBufferData& aData,
DeprecatedContentHostSingleBuffered::UpdateThebes(const ThebesBufferData& aData,
const nsIntRegion& aUpdated,
const nsIntRegion& aOldValidRegionBack,
nsIntRegion* aUpdatedRegionBack)
@ -729,7 +729,7 @@ ContentHostSingleBuffered::UpdateThebes(const ThebesBufferData& aData,
}
void
ContentHostDoubleBufferedNew::UpdateThebes(const ThebesBufferData& aData,
ContentHostDoubleBuffered::UpdateThebes(const ThebesBufferData& aData,
const nsIntRegion& aUpdated,
const nsIntRegion& aOldValidRegionBack,
nsIntRegion* aUpdatedRegionBack)
@ -765,14 +765,14 @@ ContentHostDoubleBufferedNew::UpdateThebes(const ThebesBufferData& aData,
mValidRegionForNextBackBuffer = aOldValidRegionBack;
}
ContentHostDoubleBuffered::~ContentHostDoubleBuffered()
DeprecatedContentHostDoubleBuffered::~DeprecatedContentHostDoubleBuffered()
{
DestroyTextures();
DestroyFrontHost();
}
void
ContentHostDoubleBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextureId,
DeprecatedContentHostDoubleBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextureId,
const SurfaceDescriptor& aSurface,
ISurfaceAllocator* aAllocator,
const TextureInfo& aTextureInfo)
@ -812,7 +812,7 @@ ContentHostDoubleBuffered::EnsureDeprecatedTextureHost(TextureIdentifier aTextur
}
void
ContentHostDoubleBuffered::DestroyTextures()
DeprecatedContentHostDoubleBuffered::DestroyTextures()
{
if (mNewFrontHost) {
MOZ_ASSERT(mNewFrontHost->GetDeAllocator(),
@ -839,7 +839,7 @@ ContentHostDoubleBuffered::DestroyTextures()
}
void
ContentHostDoubleBuffered::OnActorDestroy()
DeprecatedContentHostDoubleBuffered::OnActorDestroy()
{
if (mDeprecatedTextureHost) {
mDeprecatedTextureHost->OnActorDestroy();
@ -862,7 +862,7 @@ ContentHostDoubleBuffered::OnActorDestroy()
}
void
ContentHostDoubleBuffered::UpdateThebes(const ThebesBufferData& aData,
DeprecatedContentHostDoubleBuffered::UpdateThebes(const ThebesBufferData& aData,
const nsIntRegion& aUpdated,
const nsIntRegion& aOldValidRegionBack,
nsIntRegion* aUpdatedRegionBack)
@ -1147,10 +1147,10 @@ ContentHostIncremental::TextureUpdateRequest::Execute(ContentHostIncremental* aH
}
void
ContentHostBaseNew::PrintInfo(nsACString& aTo, const char* aPrefix)
ContentHostBase::PrintInfo(nsACString& aTo, const char* aPrefix)
{
aTo += aPrefix;
aTo += nsPrintfCString("ContentHostSingleBuffered (0x%p)", this);
aTo += nsPrintfCString("ContentHost (0x%p)", this);
AppendToString(aTo, mBufferRect, " [buffer-rect=", "]");
AppendToString(aTo, mBufferRotation, " [buffer-rotation=", "]");
@ -1168,10 +1168,10 @@ ContentHostBaseNew::PrintInfo(nsACString& aTo, const char* aPrefix)
}
void
ContentHostSingleBuffered::PrintInfo(nsACString& aTo, const char* aPrefix)
DeprecatedContentHostSingleBuffered::PrintInfo(nsACString& aTo, const char* aPrefix)
{
aTo += aPrefix;
aTo += nsPrintfCString("ContentHostSingleBuffered (0x%p)", this);
aTo += nsPrintfCString("DeprecatedContentHostSingleBuffered (0x%p)", this);
AppendToString(aTo, mBufferRect, " [buffer-rect=", "]");
AppendToString(aTo, mBufferRotation, " [buffer-rotation=", "]");
@ -1189,10 +1189,10 @@ ContentHostSingleBuffered::PrintInfo(nsACString& aTo, const char* aPrefix)
}
void
ContentHostDoubleBuffered::PrintInfo(nsACString& aTo, const char* aPrefix)
DeprecatedContentHostDoubleBuffered::PrintInfo(nsACString& aTo, const char* aPrefix)
{
aTo += aPrefix;
aTo += nsPrintfCString("ContentHostDoubleBuffered (0x%p)", this);
aTo += nsPrintfCString("DeprecatedContentHostDoubleBuffered (0x%p)", this);
AppendToString(aTo, mBufferRect, " [buffer-rect=", "]");
AppendToString(aTo, mBufferRotation, " [buffer-rotation=", "]");
@ -1216,11 +1216,11 @@ ContentHostDoubleBuffered::PrintInfo(nsACString& aTo, const char* aPrefix)
#ifdef MOZ_DUMP_PAINTING
void
ContentHostDoubleBuffered::Dump(FILE* aFile,
DeprecatedContentHostDoubleBuffered::Dump(FILE* aFile,
const char* aPrefix,
bool aDumpHtml)
{
ContentHostBase::Dump(aFile, aPrefix, aDumpHtml);
DeprecatedContentHostBase::Dump(aFile, aPrefix, aDumpHtml);
if (!aDumpHtml) {
return;
}
@ -1245,7 +1245,7 @@ ContentHostDoubleBuffered::Dump(FILE* aFile,
#endif
LayerRenderState
ContentHostBaseNew::GetRenderState()
ContentHostBase::GetRenderState()
{
if (!mTextureHost) {
return LayerRenderState();
@ -1261,7 +1261,7 @@ ContentHostBaseNew::GetRenderState()
}
LayerRenderState
ContentHostBase::GetRenderState()
DeprecatedContentHostBase::GetRenderState()
{
LayerRenderState result = mDeprecatedTextureHost->GetRenderState();
@ -1274,7 +1274,7 @@ ContentHostBase::GetRenderState()
#ifdef MOZ_DUMP_PAINTING
already_AddRefed<gfxImageSurface>
ContentHostBaseNew::GetAsSurface()
ContentHostBase::GetAsSurface()
{
if (!mTextureHost) {
return nullptr;
@ -1284,7 +1284,7 @@ ContentHostBaseNew::GetAsSurface()
}
already_AddRefed<gfxImageSurface>
ContentHostBase::GetAsSurface()
DeprecatedContentHostBase::GetAsSurface()
{
return mDeprecatedTextureHost->GetAsSurface();
}

50
gfx/layers/composite/ContentHost.h
View File

@ -84,14 +84,14 @@ protected:
* It is the responsibility of the ContentHost to destroy its resources when
* they are recreated or the ContentHost dies.
*/
class ContentHostBaseNew : public ContentHost
class ContentHostBase : public ContentHost
{
public:
typedef RotatedContentBuffer::ContentType ContentType;
typedef RotatedContentBuffer::PaintState PaintState;
ContentHostBaseNew(const TextureInfo& aTextureInfo);
virtual ~ContentHostBaseNew();
ContentHostBase(const TextureInfo& aTextureInfo);
virtual ~ContentHostBase();
virtual void Composite(EffectChain& aEffectChain,
float aOpacity,
@ -143,14 +143,14 @@ protected:
bool mPaintWillResample;
bool mInitialised;
};
class ContentHostBase : public ContentHost
class DeprecatedContentHostBase : public ContentHost
{
public:
typedef RotatedContentBuffer::ContentType ContentType;
typedef RotatedContentBuffer::PaintState PaintState;
ContentHostBase(const TextureInfo& aTextureInfo);
~ContentHostBase();
DeprecatedContentHostBase(const TextureInfo& aTextureInfo);
~DeprecatedContentHostBase();
virtual void Composite(EffectChain& aEffectChain,
float aOpacity,
@ -218,14 +218,14 @@ protected:
* We assume that whenever we use double buffering, then we have
* render-to-texture and thus no texture upload to do.
*/
class ContentHostDoubleBufferedNew : public ContentHostBaseNew
class ContentHostDoubleBuffered : public ContentHostBase
{
public:
ContentHostDoubleBufferedNew(const TextureInfo& aTextureInfo)
: ContentHostBaseNew(aTextureInfo)
ContentHostDoubleBuffered(const TextureInfo& aTextureInfo)
: ContentHostBase(aTextureInfo)
{}
virtual ~ContentHostDoubleBufferedNew() {}
virtual ~ContentHostDoubleBuffered() {}
virtual CompositableType GetType() { return COMPOSITABLE_CONTENT_DOUBLE; }
@ -238,14 +238,14 @@ protected:
nsIntRegion mValidRegionForNextBackBuffer;
};
class ContentHostDoubleBuffered : public ContentHostBase
class DeprecatedContentHostDoubleBuffered : public DeprecatedContentHostBase
{
public:
ContentHostDoubleBuffered(const TextureInfo& aTextureInfo)
: ContentHostBase(aTextureInfo)
DeprecatedContentHostDoubleBuffered(const TextureInfo& aTextureInfo)
: DeprecatedContentHostBase(aTextureInfo)
{}
~ContentHostDoubleBuffered();
~DeprecatedContentHostDoubleBuffered();
virtual CompositableType GetType() { return BUFFER_CONTENT_DIRECT; }
@ -282,13 +282,13 @@ protected:
* Single buffered, therefore we must synchronously upload the image from the
* DeprecatedTextureHost in the layers transaction (i.e., in UpdateThebes).
*/
class ContentHostSingleBufferedNew : public ContentHostBaseNew
class ContentHostSingleBuffered : public ContentHostBase
{
public:
ContentHostSingleBufferedNew(const TextureInfo& aTextureInfo)
: ContentHostBaseNew(aTextureInfo)
ContentHostSingleBuffered(const TextureInfo& aTextureInfo)
: ContentHostBase(aTextureInfo)
{}
virtual ~ContentHostSingleBufferedNew() {}
virtual ~ContentHostSingleBuffered() {}
virtual CompositableType GetType() { return COMPOSITABLE_CONTENT_SINGLE; }
@ -298,13 +298,13 @@ public:
nsIntRegion* aUpdatedRegionBack);
};
class ContentHostSingleBuffered : public ContentHostBase
class DeprecatedContentHostSingleBuffered : public DeprecatedContentHostBase
{
public:
ContentHostSingleBuffered(const TextureInfo& aTextureInfo)
: ContentHostBase(aTextureInfo)
DeprecatedContentHostSingleBuffered(const TextureInfo& aTextureInfo)
: DeprecatedContentHostBase(aTextureInfo)
{}
virtual ~ContentHostSingleBuffered();
virtual ~DeprecatedContentHostSingleBuffered();
virtual CompositableType GetType() { return BUFFER_CONTENT; }
@ -332,11 +332,11 @@ public:
* Delays texture uploads until the next composite to
* avoid blocking the main thread.
*/
class ContentHostIncremental : public ContentHostBase
class ContentHostIncremental : public DeprecatedContentHostBase
{
public:
ContentHostIncremental(const TextureInfo& aTextureInfo)
: ContentHostBase(aTextureInfo)
: DeprecatedContentHostBase(aTextureInfo)
, mDeAllocator(nullptr)
{}
@ -378,7 +378,7 @@ public:
{
ProcessTextureUpdates();
ContentHostBase::Composite(aEffectChain, aOpacity,
DeprecatedContentHostBase::Composite(aEffectChain, aOpacity,
aTransform, aFilter,
aClipRect, aVisibleRegion,
aLayerProperties);

2
gfx/layers/ipc/CompositableTransactionParent.cpp
View File

@ -98,7 +98,7 @@ CompositableParentManager::ReceiveCompositableUpdate(const CompositableOperation
MOZ_LAYERS_LOG(("[ParentSide] Created double buffer"));
const OpDestroyThebesBuffer& op = aEdit.get_OpDestroyThebesBuffer();
CompositableParent* compositableParent = static_cast<CompositableParent*>(op.compositableParent());
ContentHostBase* content = static_cast<ContentHostBase*>(compositableParent->GetCompositableHost());
DeprecatedContentHostBase* content = static_cast<DeprecatedContentHostBase*>(compositableParent->GetCompositableHost());
content->DestroyTextures();
break;