From f346096920c74d5cd25458881d508ae626969907 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Thu, 6 Dec 2001 00:09:21 +0000 Subject: [PATCH] Tweaking XP_MACOSX ifdefs in a few more places, including a fix for background image clipping. b=111795 r=pinkerton sr=sfraser git-svn-id: svn://10.0.0.236/trunk@109766 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/nsBlender.cpp | 2 +- mozilla/layout/base/nsCSSRendering.cpp | 4 ++-- mozilla/layout/html/style/src/nsCSSRendering.cpp | 4 ++-- mozilla/modules/libpr0n/src/imgContainer.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/gfx/src/nsBlender.cpp b/mozilla/gfx/src/nsBlender.cpp index b4dfadbc529..8841c01c99b 100644 --- a/mozilla/gfx/src/nsBlender.cpp +++ b/mozilla/gfx/src/nsBlender.cpp @@ -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 diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp index 050daf007a3..87732c3c8cc 100644 --- a/mozilla/layout/base/nsCSSRendering.cpp +++ b/mozilla/layout/base/nsCSSRendering.cpp @@ -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 diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp index 050daf007a3..87732c3c8cc 100644 --- a/mozilla/layout/html/style/src/nsCSSRendering.cpp +++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp @@ -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 diff --git a/mozilla/modules/libpr0n/src/imgContainer.cpp b/mozilla/modules/libpr0n/src/imgContainer.cpp index 2e365c36e18..1acd10b35c7 100644 --- a/mozilla/modules/libpr0n/src/imgContainer.cpp +++ b/mozilla/modules/libpr0n/src/imgContainer.cpp @@ -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;