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

Backed out changeset d37aa03d00fb (bug 1016805) for OS X 10.6 reftest failures; CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2014-06-04 17:52:55 +01:00
parent 5978e0b870
commit 4fafbc16ef
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/client/ImageClient.cpp
View File

@ -83,8 +83,8 @@ ImageClient::RemoveTextureWithTracker(TextureClient* aTexture,
#ifdef MOZ_WIDGET_GONK
// AsyncTransactionTracker is supported only on ImageBridge.
// Use AsyncTransactionTracker only when TextureClient is recyeled.
if (aAsyncTransactionTracker ||
(GetForwarder()->IsImageBridgeChild() && aTexture->HasRecycleCallback())) {
if (GetForwarder()->IsImageBridgeChild() &&
aTexture->HasRecycleCallback()) {
RefPtr<AsyncTransactionTracker> request = aAsyncTransactionTracker;
if (!request) {
// Create AsyncTransactionTracker if it is not provided as argument.

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

@ -399,14 +399,14 @@ void ImageBridgeChild::DispatchImageClientUpdate(ImageClient* aClient,
nsRefPtr<ImageContainer> >(&UpdateImageClientNow, aClient, aContainer));
}
static void FlushAllImagesSync(ImageClient* aClient, ImageContainer* aContainer, bool aExceptFront, AsyncTransactionTracker* aTracker)
static void FlushAllImagesSync(ImageClient* aClient, ImageContainer* aContainer, bool aExceptFront, AsyncTransactionTracker* aStatus)
{
MOZ_ASSERT(aClient);
sImageBridgeChildSingleton->BeginTransaction();
if (aContainer && !aExceptFront) {
aContainer->ClearCurrentImage();
}
aClient->FlushAllImages(aExceptFront, aTracker);
aClient->FlushAllImages(aExceptFront, aStatus);
aClient->OnTransaction();
sImageBridgeChildSingleton->EndTransaction();
}
@ -425,17 +425,13 @@ void ImageBridgeChild::FlushAllImages(ImageClient* aClient, ImageContainer* aCon
return;
}
RefPtr<AsyncTransactionTracker> tracker;
#ifdef MOZ_WIDGET_GONK
tracker = aClient->PrepareFlushAllImages();
#endif
RefPtr<AsyncTransactionTracker> status = aClient->PrepareFlushAllImages();
sImageBridgeChildSingleton->GetMessageLoop()->PostTask(
FROM_HERE,
NewRunnableFunction(&FlushAllImagesSync, aClient, aContainer, aExceptFront, tracker));
NewRunnableFunction(&FlushAllImagesSync, aClient, aContainer, aExceptFront, status));
if (tracker) {
tracker->WaitComplete();
}
status->WaitComplete();
}
void