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

Backed out changeset 6d9cf51a012a (bug 949360) because of mochitest-3 timeouts on a CLOSED TREE

Browse Source
This commit is contained in:
Ehsan Akhgari
2013-12-12 11:26:24 -05:00
parent b908d0e41f
commit 2952afe63b
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/ImageContainer.cpp
View File

@@ -490,17 +490,14 @@ PlanarYCbCrImage::CopyData(const Data& aData)
mData = aData;
// update buffer size
size_t size = mData.mCbCrStride * mData.mCbCrSize.height * 2 +
mBufferSize = mData.mCbCrStride * mData.mCbCrSize.height * 2 +
mData.mYStride * mData.mYSize.height;
// get new buffer
mBuffer = AllocateBuffer(size);
mBuffer = AllocateBuffer(mBufferSize);
if (!mBuffer)
return;
// update buffer size
mBufferSize = size;
mData.mYChannel = mBuffer;
mData.mCbChannel = mData.mYChannel + mData.mYStride * mData.mYSize.height;
mData.mCrChannel = mData.mCbChannel + mData.mCbCrStride * mData.mCbCrSize.height;
@@ -539,12 +536,11 @@ PlanarYCbCrImage::SetDataNoCopy(const Data &aData)
uint8_t*
PlanarYCbCrImage::AllocateAndGetNewBuffer(uint32_t aSize)
{
// update buffer size
mBufferSize = aSize;
// get new buffer
mBuffer = AllocateBuffer(aSize);
if (mBuffer) {
// update buffer size
mBufferSize = aSize;
}
mBuffer = AllocateBuffer(mBufferSize);
return mBuffer;
}