head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.05.30.10.22.05;	author pho;	state dead;
branches;
next	1.1;
commitid	pujOAy5YvcBW3yCx;

1.1
date	2014.05.30.03.03.36;	author pho;	state Exp;
branches;
next	;
commitid	SyhQGFZ06rmWDvCx;


desc
@@


1.2
log
@PR pkg/48840: Remove most patches that I have recently added

The preprocessor macro XP_MACOSX is misused everywhere. They tend to
say "#if defined(XP_MACOSX)" to actually mean
"#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
result, cairo-gtk2 build on Darwin is completely broken and needs
heavy patching. Ideally they should be fixed individually but that
will be an extremely hard work, so don't define XP_MACOSX for now.
@
text
@$NetBSD: patch-gfx_2d_Factory.cpp,v 1.1 2014/05/30 03:03:36 pho Exp $

Don't assume cocoa toolkit just because OS_ARCH is Darwin.

--- gfx/2d/Factory.cpp.orig	2014-05-06 22:55:32.000000000 +0000
+++ gfx/2d/Factory.cpp
@@@@ -23,12 +23,8 @@@@
 #include "ScaledFontWin.h"
 #endif
 
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
 #include "ScaledFontMac.h"
-#endif
-
-
-#ifdef XP_MACOSX
 #include "DrawTargetCG.h"
 #endif
 
@@@@ -258,7 +254,7 @@@@ Factory::CreateDrawTarget(BackendType aB
       break;
     }
 #endif
-#elif defined XP_MACOSX
+#elif defined MOZ_WIDGET_COCOA
   case BackendType::COREGRAPHICS:
   case BackendType::COREGRAPHICS_ACCELERATED:
     {
@@@@ -340,7 +336,7 @@@@ Factory::CreateDrawTargetForData(Backend
       retVal = newTarget;
     }
 #endif
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
   case BackendType::COREGRAPHICS:
     {
       RefPtr<DrawTargetCG> newTarget = new DrawTargetCG();
@@@@ -393,7 +389,7 @@@@ Factory::CreateScaledFontForNativeFont(c
     }
 #endif
 #endif
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
   case NativeFontType::MAC_FONT_FACE:
     {
       return new ScaledFontMac(static_cast<CGFontRef>(aNativeFont.mFont), aSize);
@@@@ -656,7 +652,7 @@@@ Factory::CreateSourceSurfaceForCairoSurf
   return retVal;
 }
 
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
 TemporaryRef<DrawTarget>
 Factory::CreateDrawTargetForCairoCGContext(CGContextRef cg, const IntSize& aSize)
 {
@


1.1
log
@PR pkg/48840: Don't assume cocoa toolkit just because OS_ARCH is Darwin
@
text
@d1 1
a1 1
$NetBSD$
@