Bug 950677 - Change gfxIntSize to gfx::IntSize in ImageContainer.h. r=nical

This commit is contained in:
Tor Arvid Lund
2013-12-20 11:46:29 -05:00
parent acd2f7f99e
commit 2dce6a7da8
8 changed files with 33 additions and 31 deletions

View File

@@ -310,7 +310,9 @@ ImageContainer::LockCurrentAsSurface(gfx::IntSize *aSize, Image** aCurrentImage)
if (mActiveImage->GetFormat() == REMOTE_IMAGE_BITMAP) {
nsRefPtr<gfxImageSurface> newSurf =
new gfxImageSurface(mRemoteData->mBitmap.mData, mRemoteData->mSize, mRemoteData->mBitmap.mStride,
new gfxImageSurface(mRemoteData->mBitmap.mData,
ThebesIntSize(mRemoteData->mSize),
mRemoteData->mBitmap.mStride,
mRemoteData->mFormat == RemoteImageData::BGRX32 ?
gfxImageFormatARGB32 :
gfxImageFormatRGB24);
@@ -380,7 +382,7 @@ ImageContainer::GetCurrentSize()
}
if (!mActiveImage) {
return gfxIntSize(0,0);
return gfx::IntSize(0,0);
}
return mActiveImage->GetSize();
@@ -464,7 +466,7 @@ PlanarYCbCrImage::AllocateBuffer(uint32_t aSize)
static void
CopyPlane(uint8_t *aDst, const uint8_t *aSrc,
const gfxIntSize &aSize, int32_t aStride, int32_t aSkip)
const gfx::IntSize &aSize, int32_t aStride, int32_t aSkip)
{
if (!aSkip) {
// Fast path: planar input.
@@ -581,7 +583,7 @@ already_AddRefed<gfxASurface>
RemoteBitmapImage::GetAsSurface()
{
nsRefPtr<gfxImageSurface> newSurf =
new gfxImageSurface(mSize,
new gfxImageSurface(ThebesIntSize(mSize),
mFormat == RemoteImageData::BGRX32 ? gfxImageFormatRGB24 : gfxImageFormatARGB32);
for (int y = 0; y < mSize.height; y++) {