- Revision
- 161853
- Author
- [email protected]
- Date
- 2014-01-12 18:42:54 -0800 (Sun, 12 Jan 2014)
Log Message
Add PLATFORM(COCOA) and USE(FOUNDATION)
https://bugs.webkit.org/show_bug.cgi?id=126859
Reviewed by Anders Carlsson.
Source/WebCore:
* config.h: Use PLATFORM(COCOA) instead of PLATFORM(MAC) || PLATFORM(IOS)
to set USE(FILE_LOCK). Would be nice to use OS(DARWIN), but that would be
a change in behavior that might be incorrect. Removed bogus comments in
the USE(NEW_THEME) setting code. Removed redundant code to set USE(CA),
which exactly duplicates code that already exists in Platform.h.
Source/WTF:
* wtf/Platform.h: Added PLATFORM(COCOA), which for now is set at exactly the same
times that PLATFORM(MAC) is. Added USE(FOUNDATION), which is set at the same times
that PLATFORM(COCOA) is. Re-organize the PLATFORM(MAC) and PLATFORM(IOS) settings
in the header so they are a bit easier to read. Put HAVE_LANGINFO_H in with the
rest of the OS(UNIX) settings and put HAVE_READLINE in with the rest of the
OS(DARWIN) settings. Tweak formatting a bit.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (161852 => 161853)
--- trunk/Source/WTF/ChangeLog 2014-01-13 02:36:50 UTC (rev 161852)
+++ trunk/Source/WTF/ChangeLog 2014-01-13 02:42:54 UTC (rev 161853)
@@ -1,3 +1,17 @@
+2014-01-12 Darin Adler <[email protected]>
+
+ Add PLATFORM(COCOA) and USE(FOUNDATION)
+ https://bugs.webkit.org/show_bug.cgi?id=126859
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/Platform.h: Added PLATFORM(COCOA), which for now is set at exactly the same
+ times that PLATFORM(MAC) is. Added USE(FOUNDATION), which is set at the same times
+ that PLATFORM(COCOA) is. Re-organize the PLATFORM(MAC) and PLATFORM(IOS) settings
+ in the header so they are a bit easier to read. Put HAVE_LANGINFO_H in with the
+ rest of the OS(UNIX) settings and put HAVE_READLINE in with the rest of the
+ OS(DARWIN) settings. Tweak formatting a bit.
+
2014-01-12 Anders Carlsson <[email protected]>
Remove AtomicallyInitializedStatic
Modified: trunk/Source/WTF/wtf/Platform.h (161852 => 161853)
--- trunk/Source/WTF/wtf/Platform.h 2014-01-13 02:36:50 UTC (rev 161852)
+++ trunk/Source/WTF/wtf/Platform.h 2014-01-13 02:42:54 UTC (rev 161853)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2013, 2014 Apple Inc. All rights reserved.
* Copyright (C) 2007-2009 Torch Mobile, Inc.
* Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
*
@@ -429,6 +429,7 @@
#elif defined(BUILDING_NIX__)
#include "nix/PlatformNix.h"
#elif OS(DARWIN)
+#define WTF_PLATFORM_COCOA 1
#define WTF_PLATFORM_MAC 1
#elif OS(WINDOWS)
#define WTF_PLATFORM_WIN 1
@@ -475,39 +476,44 @@
#define WTF_USE_ICU_UNICODE 1
#endif
+#if PLATFORM(COCOA)
+
+#define WTF_USE_CF 1
+#define WTF_USE_FOUNDATION 1
+
+#endif
+
#if PLATFORM(MAC) && !PLATFORM(IOS)
+
+#define WTF_USE_APPKIT 1
+#define HAVE_RUNLOOP_TIMER 1
+#define HAVE_SEC_IDENTITY 1
+#define HAVE_SEC_KEYCHAIN 1
+
#if CPU(X86_64)
#define WTF_USE_PLUGIN_HOST_PROCESS 1
#endif
-#define WTF_USE_CF 1
-#define HAVE_READLINE 1
-#define HAVE_RUNLOOP_TIMER 1
-#define HAVE_SEC_IDENTITY 1
-#define HAVE_SEC_KEYCHAIN 1
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
#define HAVE_LAYER_HOSTING_IN_WINDOW_SERVER 1
#endif
-#define WTF_USE_APPKIT 1
/* OS X defines a series of platform macros for debugging. */
/* Some of them are really annoying because they use common names (e.g. check()). */
/* Disable those macros so that we are not limited in how we name methods and functions. */
#undef __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES
#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+
#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
-#if PLATFORM(IOS)
-#define DONT_FINALIZE_ON_MAIN_THREAD 1
-#endif
-
#if OS(DARWIN) && !PLATFORM(GTK)
#define ENABLE_PURGEABLE_MEMORY 1
#endif
#if PLATFORM(IOS)
+
+#define DONT_FINALIZE_ON_MAIN_THREAD 1
#define HAVE_READLINE 1
-#define WTF_USE_APPKIT 0
-#define WTF_USE_CF 1
#define WTF_USE_CFNETWORK 1
#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
#define WTF_USE_WEB_THREAD 1
@@ -515,6 +521,7 @@
#if CPU(ARM64)
#define ENABLE_JIT_CONSTANT_BLINDING 0
#endif
+
#endif /* PLATFORM(IOS) */
#if PLATFORM(WIN) && !USE(WINGDI)
@@ -537,7 +544,8 @@
#if OS(UNIX)
#define HAVE_ERRNO_H 1
-#define HAVE_MMAP 1
+#define HAVE_LANGINFO_H 1
+#define HAVE_MMAP 1
#define HAVE_SIGNAL_H 1
#define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1
@@ -545,10 +553,6 @@
#define WTF_USE_PTHREADS 1
#endif /* OS(UNIX) */
-#if OS(UNIX)
-#define HAVE_LANGINFO_H 1
-#endif
-
#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
#define HAVE_PTHREAD_NP_H 1
#endif
@@ -578,16 +582,18 @@
#define HAVE_MADV_FREE_REUSE 1
#define HAVE_MERGESORT 1
#define HAVE_PTHREAD_SETNAME_NP 1
+#define HAVE_READLINE 1
#define HAVE_SYS_TIMEB_H 1
#define WTF_USE_ACCELERATE 1
#if !PLATFORM(IOS)
#define HAVE_HOSTED_CORE_ANIMATION 1
-#endif /* !PLATFORM(IOS) */
+#endif
#endif /* OS(DARWIN) */
#if OS(WINDOWS) && !OS(WINCE)
+
#define HAVE_SYS_TIMEB_H 1
#define HAVE_ALIGNED_MALLOC 1
#define HAVE_ISDEBUGGERPRESENT 1
Modified: trunk/Source/WebCore/ChangeLog (161852 => 161853)
--- trunk/Source/WebCore/ChangeLog 2014-01-13 02:36:50 UTC (rev 161852)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 02:42:54 UTC (rev 161853)
@@ -1,5 +1,18 @@
2014-01-12 Darin Adler <[email protected]>
+ Add PLATFORM(COCOA) and USE(FOUNDATION)
+ https://bugs.webkit.org/show_bug.cgi?id=126859
+
+ Reviewed by Anders Carlsson.
+
+ * config.h: Use PLATFORM(COCOA) instead of PLATFORM(MAC) || PLATFORM(IOS)
+ to set USE(FILE_LOCK). Would be nice to use OS(DARWIN), but that would be
+ a change in behavior that might be incorrect. Removed bogus comments in
+ the USE(NEW_THEME) setting code. Removed redundant code to set USE(CA),
+ which exactly duplicates code that already exists in Platform.h.
+
+2014-01-12 Darin Adler <[email protected]>
+
Add deprecatedCharacters as a synonym for characters and convert most call sites
https://bugs.webkit.org/show_bug.cgi?id=126858
Modified: trunk/Source/WebCore/config.h (161852 => 161853)
--- trunk/Source/WebCore/config.h 2014-01-13 02:36:50 UTC (rev 161852)
+++ trunk/Source/WebCore/config.h 2014-01-13 02:42:54 UTC (rev 161853)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc.
+ * Copyright (C) 2004, 2005, 2006, 2013, 2014 Apple Inc. All rights reserved.
* Copyright (C) 2009 Google Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
#include <wtf/Platform.h>
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
#define WTF_USE_FILE_LOCK 1
#endif
@@ -101,9 +101,8 @@
#endif
#if PLATFORM(MAC) && !PLATFORM(IOS)
-// New theme
#define WTF_USE_NEW_THEME 1
-#endif // PLATFORM(MAC)
+#endif
#if USE(CG)
#ifndef CGFLOAT_DEFINED
@@ -120,11 +119,6 @@
#define WTF_USE_SAFARI_THEME 1
#endif
-// CoreAnimation is available to IOS, Mac and Windows if using CG
-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
-#define WTF_USE_CA 1
-#endif
-
#if PLATFORM(IOS)
#define WEBCORE_NAVIGATOR_PLATFORM wkGetPlatformNameForNavigator();
#define WEBCORE_NAVIGATOR_VENDOR wkGetVendorNameForNavigator();
