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 721627. Don't return nsRefPtr/nsCOMPtr from nsDisplayImage methods. nsDisplayImage::GetImage is unused anyway. r=mats

Browse Source
This commit is contained in:
Robert O'Callahan 2012-01-30 18:16:54 +13:00
parent 448edccb22
commit 1f8d8e9fb6
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/src/RasterImage.cpp
View File

@ -953,6 +953,7 @@ RasterImage::GetImageContainer(LayerManager* aManager,
(!mImageContainer->Manager() &&
(mImageContainer->GetBackendType() == aManager->GetBackendType())))) {
*_retval = mImageContainer;
NS_ADDREF(*_retval);
return NS_OK;
}
@ -978,6 +979,7 @@ RasterImage::GetImageContainer(LayerManager* aManager,
mImageContainer->SetCurrentImage(image);
*_retval = mImageContainer;
NS_ADDREF(*_retval);
return NS_OK;
}

4
layout/base/FrameLayerBuilder.cpp
View File

@ -219,7 +219,7 @@ protected:
* supports being optimized to an ImageLayer (TYPE_RASTER only) returns
* an ImageContainer for the image.
*/
nsRefPtr<ImageContainer> CanOptimizeImageLayer(LayerManager* aManager);
already_AddRefed<ImageContainer> CanOptimizeImageLayer(LayerManager* aManager);
/**
* The region of visible content in the layer, relative to the
@ -968,7 +968,7 @@ ContainerState::FindOpaqueBackgroundColorFor(PRInt32 aThebesLayerIndex)
return NS_RGBA(0,0,0,0);
}
nsRefPtr<ImageContainer>
already_AddRefed<ImageContainer>
ContainerState::ThebesLayerData::CanOptimizeImageLayer(LayerManager* aManager)
{
if (!mImage || !mImageClip.mRoundedClipRects.IsEmpty()) {

16
layout/generic/nsImageFrame.cpp
View File

@ -1210,19 +1210,13 @@ nsDisplayImage::Paint(nsDisplayListBuilder* aBuilder,
: (PRUint32) imgIContainer::FLAG_NONE);
}
nsCOMPtr<imgIContainer>
nsDisplayImage::GetImage()
{
return mImage;
}
nsRefPtr<ImageContainer>
already_AddRefed<ImageContainer>
nsDisplayImage::GetContainer(LayerManager* aManager)
{
ImageContainer* container;
nsresult rv = mImage->GetImageContainer(aManager, &container);
NS_ENSURE_SUCCESS(rv, NULL);
return container;
nsRefPtr<ImageContainer> container;
nsresult rv = mImage->GetImageContainer(aManager, getter_AddRefs(container));
NS_ENSURE_SUCCESS(rv, nsnull);
return container.forget();
}
void

3
layout/generic/nsImageFrame.h
View File

@ -386,13 +386,12 @@ public:
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsCOMPtr<imgIContainer> GetImage();
/**
* Returns an ImageContainer for this image if the image type
* supports it (TYPE_RASTER only).
*/
nsRefPtr<ImageContainer> GetContainer(LayerManager* aManager);
already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager);
/**
* Configure an ImageLayer for this display item.