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 717872 - Make blending functions take const source parameters so it's a little less likely that we modify things in mFrames again. r=seth

Browse Source
This commit is contained in:
Joe Drew 2013-06-28 15:01:32 -04:00
parent 25beec1ea3
commit b029ebc59f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
image/src/FrameBlender.cpp
View File

@ -138,8 +138,8 @@ FrameBlender::DoBlend(nsIntRect* aDirtyRect,
return false;
}
FrameDataPair& prevFrame = mFrames[aPrevFrameIndex];
FrameDataPair& nextFrame = mFrames[aNextFrameIndex];
const FrameDataPair& prevFrame = mFrames[aPrevFrameIndex];
const FrameDataPair& nextFrame = mFrames[aNextFrameIndex];
if (!prevFrame.HasFrameData() || !nextFrame.HasFrameData()) {
return false;
}
@ -433,7 +433,7 @@ FrameBlender::ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect, const
// Whether we succeed or fail will not cause a crash, and there's not much
// we can do about a failure, so there we don't return a nsresult
bool
FrameBlender::CopyFrameImage(uint8_t *aDataSrc, const nsIntRect& aRectSrc,
FrameBlender::CopyFrameImage(const uint8_t *aDataSrc, const nsIntRect& aRectSrc,
uint8_t *aDataDest, const nsIntRect& aRectDest)
{
uint32_t dataLengthSrc = aRectSrc.width * aRectSrc.height * 4;
@ -449,7 +449,7 @@ FrameBlender::CopyFrameImage(uint8_t *aDataSrc, const nsIntRect& aRectSrc,
}
nsresult
FrameBlender::DrawFrameTo(uint8_t *aSrcData, const nsIntRect& aSrcRect,
FrameBlender::DrawFrameTo(const uint8_t *aSrcData, const nsIntRect& aSrcRect,
uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
uint8_t *aDstPixels, const nsIntRect& aDstRect,
FrameBlender::FrameBlendMethod aBlendMethod)
@ -483,9 +483,9 @@ FrameBlender::DrawFrameTo(uint8_t *aSrcData, const nsIntRect& aSrcRect,
"FrameBlender::DrawFrameTo: source must be smaller than dest");
// Get pointers to image data
uint8_t *srcPixels = aSrcData + aSrcPaletteLength;
const uint8_t *srcPixels = aSrcData + aSrcPaletteLength;
uint32_t *dstPixels = reinterpret_cast<uint32_t*>(aDstPixels);
uint32_t *colormap = reinterpret_cast<uint32_t*>(aSrcData);
const uint32_t *colormap = reinterpret_cast<const uint32_t*>(aSrcData);
// Skip to the right offset
dstPixels += aSrcRect.x + (aSrcRect.y * aDstRect.width);
@ -514,7 +514,7 @@ FrameBlender::DrawFrameTo(uint8_t *aSrcData, const nsIntRect& aSrcRect,
pixman_image_t* src = pixman_image_create_bits(aSrcHasAlpha ? PIXMAN_a8r8g8b8 : PIXMAN_x8r8g8b8,
aSrcRect.width,
aSrcRect.height,
reinterpret_cast<uint32_t*>(aSrcData),
reinterpret_cast<uint32_t*>(const_cast<uint8_t*>(aSrcData)),
aSrcRect.width * 4);
pixman_image_t* dst = pixman_image_create_bits(PIXMAN_a8r8g8b8,
aDstRect.width,

4
image/src/FrameBlender.h
View File

@ -250,7 +250,7 @@ private:
static void ClearFrame(uint8_t* aFrameData, const nsIntRect& aFrameRect, const nsIntRect &aRectToClear);
//! Copy one frames's image and mask into another
static bool CopyFrameImage(uint8_t *aDataSrc, const nsIntRect& aRectSrc,
static bool CopyFrameImage(const uint8_t *aDataSrc, const nsIntRect& aRectSrc,
uint8_t *aDataDest, const nsIntRect& aRectDest);
/**
@ -268,7 +268,7 @@ private:
* @aDstRect the size of the composition frame
* @aBlendMethod the blend method for how to blend src on the composition frame.
*/
static nsresult DrawFrameTo(uint8_t *aSrcData, const nsIntRect& aSrcRect,
static nsresult DrawFrameTo(const uint8_t *aSrcData, const nsIntRect& aSrcRect,
uint32_t aSrcPaletteLength, bool aSrcHasAlpha,
uint8_t *aDstPixels, const nsIntRect& aDstRect,
FrameBlendMethod aBlendMethod);