зеркало из https://github.com/mozilla/pjs.git
bug 12037. A small fix for a regression that was and r=peterl sr=attinasi and a=dbaron. I forgot to checkin the
check to see if I handled the print. This fixes my regression.
This commit is contained in:
Родитель
67be8fb464
Коммит
c4c48dc4ff
|
@ -482,6 +482,8 @@ nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
|
||||||
|
|
||||||
if (nsnull != TheHDC){
|
if (nsnull != TheHDC){
|
||||||
if (!IsOptimized() || nsnull==mHBitmap){
|
if (!IsOptimized() || nsnull==mHBitmap){
|
||||||
|
PRBool didComposite = PR_FALSE;
|
||||||
|
|
||||||
rop = SRCCOPY;
|
rop = SRCCOPY;
|
||||||
|
|
||||||
if (nsnull != mAlphaBits){
|
if (nsnull != mAlphaBits){
|
||||||
|
@ -490,6 +492,7 @@ nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
|
||||||
MONOBITMAPINFO bmi(mAlphaWidth, mAlphaHeight);
|
MONOBITMAPINFO bmi(mAlphaWidth, mAlphaHeight);
|
||||||
CompositeBitsInMemory(TheHDC,aDX,aDY,aDWidth,aDHeight,aSX,aSY,aSWidth,aSHeight,srcy,
|
CompositeBitsInMemory(TheHDC,aDX,aDY,aDWidth,aDHeight,aSX,aSY,aSWidth,aSHeight,srcy,
|
||||||
mAlphaBits,&bmi,mImageBits,mBHead,mNumPaletteColors);
|
mAlphaBits,&bmi,mImageBits,mBHead,mNumPaletteColors);
|
||||||
|
didComposite = PR_TRUE;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
MONOBITMAPINFO bmi(mAlphaWidth, mAlphaHeight);
|
MONOBITMAPINFO bmi(mAlphaWidth, mAlphaHeight);
|
||||||
|
@ -502,7 +505,7 @@ nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (canRaster != DT_RASPRINTER){
|
if (PR_FALSE == didComposite){
|
||||||
if (8==mAlphaDepth) {
|
if (8==mAlphaDepth) {
|
||||||
DrawComposited(TheHDC, aDX, aDY, aDWidth, aDHeight,
|
DrawComposited(TheHDC, aDX, aDY, aDWidth, aDHeight,
|
||||||
aSX, srcy, aSWidth, aSHeight);
|
aSX, srcy, aSWidth, aSHeight);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче