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 783043 - Backed out changeset 29bc4fa125d9 (commit message). r=me

Browse Source
This commit is contained in:
Nicolas Silva 2014-06-21 19:51:07 +02:00
parent a77defb05f
commit 4dbefdf0a1
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/layers/ImageContainer.h
View File

@ -511,11 +511,6 @@ public:
mImageFactory = aFactory ? aFactory : new ImageFactory();
}
ImageFactory* GetImageFactory() const
{
return mImageFactory;
}
/**
* Returns the time at which the currently contained image was first
* painted. This is reset every time a new image is set as the current

7
gfx/layers/basic/BasicImageLayer.cpp
View File

@ -74,7 +74,6 @@ BasicImageLayer::Paint(DrawTarget* aDT,
return;
}
nsRefPtr<ImageFactory> originalIF = mContainer->GetImageFactory();
mContainer->SetImageFactory(mManager->IsCompositingCheap() ? nullptr : BasicManager()->GetImageFactory());
RefPtr<gfx::SourceSurface> surface;
@ -83,7 +82,6 @@ BasicImageLayer::Paint(DrawTarget* aDT,
gfx::IntSize size = mSize = autoLock.GetSize();
if (!surface || !surface->IsValid()) {
mContainer->SetImageFactory(originalIF);
return;
}
@ -92,7 +90,6 @@ BasicImageLayer::Paint(DrawTarget* aDT,
DrawOptions(GetEffectiveOpacity(), GetEffectiveOperator(this)),
aMaskLayer);
mContainer->SetImageFactory(originalIF);
GetContainer()->NotifyPaintedImage(image);
}
@ -105,7 +102,6 @@ BasicImageLayer::GetAndPaintCurrentImage(DrawTarget* aTarget,
return;
}
nsRefPtr<ImageFactory> originalIF = mContainer->GetImageFactory();
mContainer->SetImageFactory(mManager->IsCompositingCheap() ?
nullptr :
BasicManager()->GetImageFactory());
@ -115,7 +111,6 @@ BasicImageLayer::GetAndPaintCurrentImage(DrawTarget* aTarget,
mContainer->LockCurrentAsSourceSurface(&size, &image);
if (!surf) {
mContainer->SetImageFactory(originalIF);
return;
}
@ -131,8 +126,6 @@ BasicImageLayer::GetAndPaintCurrentImage(DrawTarget* aTarget,
GetContainer()->NotifyPaintedImage(image);
}
mContainer->SetImageFactory(originalIF);
mContainer->UnlockCurrentImage();
}