From f42cd7e6a3f47c5db3843cd02bc4969ea3a3bf68 Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Fri, 3 Oct 2008 19:26:23 +0000 Subject: roll foward /* git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2843 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/config.h.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'webkit') diff --git a/webkit/config.h.in b/webkit/config.h.in index e11f6ad..d77ed84 100644 --- a/webkit/config.h.in +++ b/webkit/config.h.in @@ -124,14 +124,18 @@ #if PLATFORM(CHROMIUM) #define WTF_USE_V8 1 #define WTF_PLATFORM_SKIA 1 + +#if !PLATFORM(MAC) #undef WTF_PLATFORM_CG #undef WTF_PLATFORM_CF +#endif + #undef WTF_USE_CFNETWORK // Upstream Platform.h's #ifdef check for other graphics libraries doesn't // check SKIA, so it falls back on defining CAIRO. Undo that here. // TODO(evanm): clean this up. #undef WTF_PLATFORM_CAIRO -#endif +#endif // if PLATFORM(CHROMIUM) #if !defined(WTF_USE_V8) #define WTF_USE_V8 0 -- cgit v1.1