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 793175: Discard a cached SourceSurface if it was created for the wrong BackendType. r=jrmuizel

Browse Source
This commit is contained in:
Bas Schouten 2012-10-08 15:44:36 +13:00
parent 4c78df6cee
commit a813e80bc2
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gfx/thebes/gfxPlatform.cpp
View File

@ -489,9 +489,22 @@ gfxPlatform::CreateDrawTargetForSurface(gfxASurface *aSurface, const IntSize& aS
cairo_user_data_key_t kSourceSurface; cairo_user_data_key_t kSourceSurface;
void SourceBufferDestroy(void *srcBuffer) /**
* Record the backend that was used to construct the SourceSurface.
* When getting the cached SourceSurface for a gfxASurface/DrawTarget pair,
* we check to make sure the DrawTarget's backend matches the backend
* for the cached SourceSurface, and only use it if they match. This
* can avoid expensive and unnecessary readbacks.
*/
struct SourceSurfaceUserData
{ {
static_cast<SourceSurface*>(srcBuffer)->Release(); RefPtr<SourceSurface> mSrcSurface;
BackendType mBackendType;
};
void SourceBufferDestroy(void *srcSurfUD)
{
delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
} }
void SourceSnapshotDetached(cairo_surface_t *nullSurf) void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@ -508,10 +521,10 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
void *userData = aSurface->GetData(&kSourceSurface); void *userData = aSurface->GetData(&kSourceSurface);
if (userData) { if (userData) {
SourceSurface *surf = static_cast<SourceSurface*>(userData); SourceSurfaceUserData *surf = static_cast<SourceSurfaceUserData*>(userData);
if (surf->IsValid()) { if (surf->mSrcSurface->IsValid() && surf->mBackendType == aTarget->GetType()) {
return surf; return surf->mSrcSurface;
} }
// We can just continue here as when setting new user data the destroy // We can just continue here as when setting new user data the destroy
// function will be called for the old user data. // function will be called for the old user data.
@ -624,7 +637,11 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
} }
srcBuffer->AddRef(); srcBuffer->AddRef();
aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
srcSurfUD->mBackendType = aTarget->GetType();
srcSurfUD->mSrcSurface = srcBuffer;
aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy);
return srcBuffer; return srcBuffer;
} }