summaryrefslogtreecommitdiffstats
path: root/webkit/config.h.in
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 17:23:24 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 17:23:24 +0000
commitc91996ae5eb9354b1d1eedfea3622a0ce0987e5a (patch)
tree9d3e4bd08e15276d0df5ffb9c48975c4b28254cb /webkit/config.h.in
parentb40a152e3b226cb9ea70fd19b49a9869a0a5b96b (diff)
downloadchromium_src-c91996ae5eb9354b1d1eedfea3622a0ce0987e5a.zip
chromium_src-c91996ae5eb9354b1d1eedfea3622a0ce0987e5a.tar.gz
chromium_src-c91996ae5eb9354b1d1eedfea3622a0ce0987e5a.tar.bz2
chromium tree changes for removing platform(mac).
Review URL: http://codereview.chromium.org/8032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/config.h.in')
-rw-r--r--webkit/config.h.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/config.h.in b/webkit/config.h.in
index bf2648d..015e9f0 100644
--- a/webkit/config.h.in
+++ b/webkit/config.h.in
@@ -122,17 +122,18 @@
#endif
#if PLATFORM(CHROMIUM)
+#if !PLATFORM(DARWIN)
+// Don't define SKIA on Mac. Undefine other things as well that might get set
+// as side-effects.
#define WTF_PLATFORM_SKIA 1
+#undef WTF_PLATFORM_CG
+#undef WTF_PLATFORM_CF
+#endif
#if !defined(WTF_USE_V8)
#define WTF_USE_V8 1
#endif
-#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.