corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 39a3044823b0 because of bad interaction with maple.

Browse Source
This commit is contained in:
Benoit Girard
2012-03-02 18:32:46 -05:00
parent a41da854d6
commit ae335d8d56
334 changed files with 3273 additions and 5522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/layers/basic/BasicLayers.cpp
View File

@@ -915,11 +915,9 @@ BasicImageLayer::GetAndPaintCurrentImage(gfxContext* aContext,
mContainer->SetImageFactory(mManager->IsCompositingCheap() ? nsnull : BasicManager()->GetImageFactory());
nsRefPtr<gfxASurface> surface;
AutoLockImage autoLock(mContainer, getter_AddRefs(surface));
Image *image = autoLock.GetImage();
mSize = autoLock.GetSize();
nsRefPtr<Image> image = mContainer->GetCurrentImage();
nsRefPtr<gfxASurface> surface = mContainer->GetCurrentAsSurface(&mSize);
if (!surface || surface->CairoStatus()) {
return nsnull;
}
@@ -2542,16 +2540,13 @@ BasicShadowableImageLayer::Paint(gfxContext* aContext)
return;
}
AutoLockImage autoLock(mContainer);
Image *image = autoLock.GetImage();
nsRefPtr<Image> image = mContainer->GetCurrentImage();
if (!image) {
return;
}
if (image->GetFormat() == Image::PLANAR_YCBCR && BasicManager()->IsCompositingCheap()) {
PlanarYCbCrImage *YCbCrImage = static_cast<PlanarYCbCrImage*>(image);
PlanarYCbCrImage *YCbCrImage = static_cast<PlanarYCbCrImage*>(image.get());
const PlanarYCbCrImage::Data *data = YCbCrImage->GetData();
NS_ASSERTION(data, "Must be able to retrieve yuv data from image!");