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 959842. Rename ContentClient::ReturnDrawTarget. r=mattwoodrow

Browse Source
This commit is contained in:
Nicholas Cameron 2014-01-24 19:58:33 +13:00
parent a0164d2145
commit 207399c36e
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/layers/RotatedBuffer.h
View File

@ -391,7 +391,6 @@ protected:
gfx::DrawTarget*
BorrowDrawTargetForQuadrantUpdate(const nsIntRect& aBounds,
ContextSource aSource);
void ReturnDrawTarget(gfx::DrawTarget* aReturned);
static bool IsClippingCheap(gfx::DrawTarget* aTarget, const nsIntRegion& aRegion);

2
gfx/layers/basic/BasicThebesLayer.cpp
View File

@ -207,7 +207,7 @@ BasicThebesLayer::Validate(LayerManager::DrawThebesLayerCallback aCallback,
MOZ_LAYERS_LOG_IF_SHADOWABLE(this, ("Layer::Mutated(%p) PaintThebes", this));
Mutated();
ctx = nullptr;
mContentClient->ReturnDrawTarget(target);
mContentClient->ReturnDrawTargetToBuffer(target);
RenderTraceInvalidateEnd(this, "FFFF00");
} else {

2
gfx/layers/client/ClientThebesLayer.cpp
View File

@ -70,7 +70,7 @@ ClientThebesLayer::PaintThebes()
MOZ_LAYERS_LOG_IF_SHADOWABLE(this, ("Layer::Mutated(%p) PaintThebes", this));
Mutated();
ctx = nullptr;
mContentClient->ReturnDrawTarget(target);
mContentClient->ReturnDrawTargetToBuffer(target);
} else {
// It's possible that state.mRegionToInvalidate is nonempty here,
// if we are shrinking the valid region to nothing. So use mRegionToDraw

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

@ -656,7 +656,7 @@ ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
if (isClippingCheap) {
destDT->PopClip();
}
ReturnDrawTarget(destDT);
ReturnDrawTargetToBuffer(destDT);
if (aSource.HaveBufferOnWhite()) {
MOZ_ASSERT(HaveBufferOnWhite());
@ -675,7 +675,7 @@ ContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer& aSource,
if (isClippingCheap) {
destDT->PopClip();
}
ReturnDrawTarget(destDT);
ReturnDrawTargetToBuffer(destDT);
}
}
@ -895,7 +895,7 @@ DeprecatedContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer
if (isClippingCheap) {
destDT->PopClip();
}
ReturnDrawTarget(destDT);
ReturnDrawTargetToBuffer(destDT);
if (aSource.HaveBufferOnWhite()) {
MOZ_ASSERT(HaveBufferOnWhite());
@ -914,7 +914,7 @@ DeprecatedContentClientDoubleBuffered::UpdateDestinationFrom(const RotatedBuffer
if (isClippingCheap) {
destDT->PopClip();
}
ReturnDrawTarget(destDT);
ReturnDrawTargetToBuffer(destDT);
}
}

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

@ -98,7 +98,7 @@ public:
uint32_t aFlags) = 0;
virtual gfx::DrawTarget* BorrowDrawTargetForPainting(ThebesLayer* aLayer,
const RotatedContentBuffer::PaintState& aPaintState) = 0;
virtual void ReturnDrawTarget(gfx::DrawTarget*& aReturned) = 0;
virtual void ReturnDrawTargetToBuffer(gfx::DrawTarget*& aReturned) = 0;
virtual void PrepareFrame() {}
@ -148,7 +148,7 @@ public:
{
return RotatedContentBuffer::BorrowDrawTargetForPainting(aLayer, aPaintState);
}
virtual void ReturnDrawTarget(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
virtual void ReturnDrawTargetToBuffer(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
{
BorrowDrawTarget::ReturnDrawTarget(aReturned);
}
@ -218,7 +218,7 @@ public:
{
return RotatedContentBuffer::BorrowDrawTargetForPainting(aLayer, aPaintState);
}
virtual void ReturnDrawTarget(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
virtual void ReturnDrawTargetToBuffer(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
{
BorrowDrawTarget::ReturnDrawTarget(aReturned);
}
@ -328,7 +328,7 @@ public:
{
return RotatedContentBuffer::BorrowDrawTargetForPainting(aLayer, aPaintState);
}
virtual void ReturnDrawTarget(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
virtual void ReturnDrawTargetToBuffer(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
{
BorrowDrawTarget::ReturnDrawTarget(aReturned);
}
@ -563,7 +563,7 @@ public:
uint32_t aFlags) MOZ_OVERRIDE;
virtual gfx::DrawTarget* BorrowDrawTargetForPainting(ThebesLayer* aLayer,
const PaintState& aPaintState) MOZ_OVERRIDE;
virtual void ReturnDrawTarget(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
virtual void ReturnDrawTargetToBuffer(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
{
BorrowDrawTarget::ReturnDrawTarget(aReturned);
}