Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaking XP_MACOSX ifdefs in a few more places, including a fix for background image clipping. b=111795 r=pinkerton sr=sfraser

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@109766 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2001-12-06 00:09:21 +00:00
parent 218aedbf6a
commit f346096920
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/gfx/src/nsBlender.cpp
View File

@@ -67,7 +67,7 @@ NS_IMPL_ISUPPORTS1(nsBlender, nsIBlender);
// need to set up some masks for 16 bit blending
// Use compile-time constants where possible for marginally smaller
// footprint (don't need fields in nsBlender) but also for faster code
#ifdef XP_MAC
#if defined(XP_MAC) || defined(XP_MACOSX)
#define BLEND_RED_MASK 0x7c00
#define BLEND_GREEN_MASK 0x03e0

4
mozilla/layout/base/nsCSSRendering.cpp
View File

@@ -2645,7 +2645,7 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
}
#if !defined(XP_UNIX) && !defined(XP_BEOS)
#if (!defined(XP_UNIX) && !defined(XP_BEOS)) || defined(XP_MACOSX)
// Setup clipping so that rendering doesn't leak out of the computed
// dirty rect
PRBool clipState;
@@ -2805,7 +2805,7 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
}
#endif
#if !defined(XP_UNIX) && !defined(XP_BEOS)
#if (!defined(XP_UNIX) && !defined(XP_BEOS)) || defined(XP_MACOSX)
// Restore clipping
aRenderingContext.PopState(clipState);
#endif

4
mozilla/layout/html/style/src/nsCSSRendering.cpp
View File

@@ -2645,7 +2645,7 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
}
#if !defined(XP_UNIX) && !defined(XP_BEOS)
#if (!defined(XP_UNIX) && !defined(XP_BEOS)) || defined(XP_MACOSX)
// Setup clipping so that rendering doesn't leak out of the computed
// dirty rect
PRBool clipState;
@@ -2805,7 +2805,7 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
}
#endif
#if !defined(XP_UNIX) && !defined(XP_BEOS)
#if (!defined(XP_UNIX) && !defined(XP_BEOS)) || defined(XP_MACOSX)
// Restore clipping
aRenderingContext.PopState(clipState);
#endif

2
mozilla/modules/libpr0n/src/imgContainer.cpp
View File

@@ -656,7 +656,7 @@ void imgContainer::FillWithColor(gfxIImageFrame *aFrame, gfx_color color)
*rgbRowIndex++ = (backgroundColor & 0x0000FF00) >> 8;
*rgbRowIndex++ = backgroundColor & 0x000000FF;
#else
#ifdef XP_MAC
#if defined(XP_MAC) || defined(XP_MACOSX)
*rgbRowIndex++ = 0;
#endif
*rgbRowIndex++ = backgroundColor & 0x000000FF;