<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161853] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161853">161853</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 18:42:54 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161852 => 161853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-12 Darin Adler <darin@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2014-01-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove AtomicallyInitializedStatic
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (161852 => 161853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2007-2009 Torch Mobile, Inc.
</span><span class="cx"> * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -429,6 +429,7 @@
</span><span class="cx"> #elif defined(BUILDING_NIX__)
</span><span class="cx"> #include "nix/PlatformNix.h"
</span><span class="cx"> #elif OS(DARWIN)
</span><ins>+#define WTF_PLATFORM_COCOA 1
</ins><span class="cx"> #define WTF_PLATFORM_MAC 1
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> #define WTF_PLATFORM_WIN 1
</span><span class="lines">@@ -475,39 +476,44 @@
</span><span class="cx"> #define WTF_USE_ICU_UNICODE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+
+#define WTF_USE_CF 1
+#define WTF_USE_FOUNDATION 1
+
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><ins>+
+#define WTF_USE_APPKIT 1
+#define HAVE_RUNLOOP_TIMER 1
+#define HAVE_SEC_IDENTITY 1
+#define HAVE_SEC_KEYCHAIN 1
+
</ins><span class="cx"> #if CPU(X86_64)
</span><span class="cx"> #define WTF_USE_PLUGIN_HOST_PROCESS 1
</span><span class="cx"> #endif
</span><del>-#define WTF_USE_CF 1
-#define HAVE_READLINE 1
-#define HAVE_RUNLOOP_TIMER 1
-#define HAVE_SEC_IDENTITY 1
-#define HAVE_SEC_KEYCHAIN 1
</del><ins>+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="cx"> #define HAVE_LAYER_HOSTING_IN_WINDOW_SERVER 1
</span><span class="cx"> #endif
</span><del>-#define WTF_USE_APPKIT 1
</del><span class="cx">
</span><span class="cx"> /* OS X defines a series of platform macros for debugging. */
</span><span class="cx"> /* Some of them are really annoying because they use common names (e.g. check()). */
</span><span class="cx"> /* Disable those macros so that we are not limited in how we name methods and functions. */
</span><span class="cx"> #undef __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES
</span><span class="cx"> #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
</span><ins>+
</ins><span class="cx"> #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#define DONT_FINALIZE_ON_MAIN_THREAD 1
-#endif
-
</del><span class="cx"> #if OS(DARWIN) && !PLATFORM(GTK)
</span><span class="cx"> #define ENABLE_PURGEABLE_MEMORY 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
+#define DONT_FINALIZE_ON_MAIN_THREAD 1
</ins><span class="cx"> #define HAVE_READLINE 1
</span><del>-#define WTF_USE_APPKIT 0
-#define WTF_USE_CF 1
</del><span class="cx"> #define WTF_USE_CFNETWORK 1
</span><span class="cx"> #define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
</span><span class="cx"> #define WTF_USE_WEB_THREAD 1
</span><span class="lines">@@ -515,6 +521,7 @@
</span><span class="cx"> #if CPU(ARM64)
</span><span class="cx"> #define ENABLE_JIT_CONSTANT_BLINDING 0
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #endif /* PLATFORM(IOS) */
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && !USE(WINGDI)
</span><span class="lines">@@ -537,7 +544,8 @@
</span><span class="cx">
</span><span class="cx"> #if OS(UNIX)
</span><span class="cx"> #define HAVE_ERRNO_H 1
</span><del>-#define HAVE_MMAP 1
</del><ins>+#define HAVE_LANGINFO_H 1
+#define HAVE_MMAP 1
</ins><span class="cx"> #define HAVE_SIGNAL_H 1
</span><span class="cx"> #define HAVE_STRINGS_H 1
</span><span class="cx"> #define HAVE_SYS_PARAM_H 1
</span><span class="lines">@@ -545,10 +553,6 @@
</span><span class="cx"> #define WTF_USE_PTHREADS 1
</span><span class="cx"> #endif /* OS(UNIX) */
</span><span class="cx">
</span><del>-#if OS(UNIX)
-#define HAVE_LANGINFO_H 1
-#endif
-
</del><span class="cx"> #if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
</span><span class="cx"> #define HAVE_PTHREAD_NP_H 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -578,16 +582,18 @@
</span><span class="cx"> #define HAVE_MADV_FREE_REUSE 1
</span><span class="cx"> #define HAVE_MERGESORT 1
</span><span class="cx"> #define HAVE_PTHREAD_SETNAME_NP 1
</span><ins>+#define HAVE_READLINE 1
</ins><span class="cx"> #define HAVE_SYS_TIMEB_H 1
</span><span class="cx"> #define WTF_USE_ACCELERATE 1
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #define HAVE_HOSTED_CORE_ANIMATION 1
</span><del>-#endif /* !PLATFORM(IOS) */
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #endif /* OS(DARWIN) */
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS) && !OS(WINCE)
</span><ins>+
</ins><span class="cx"> #define HAVE_SYS_TIMEB_H 1
</span><span class="cx"> #define HAVE_ALIGNED_MALLOC 1
</span><span class="cx"> #define HAVE_ISDEBUGGERPRESENT 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161852 => 161853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ 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 <darin@apple.com>
+
</ins><span class="cx"> Add deprecatedCharacters as a synonym for characters and convert most call sites
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126858
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (161852 => 161853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc.
</del><ins>+ * Copyright (C) 2004, 2005, 2006, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2009 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_FILE_LOCK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -101,9 +101,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><del>-// New theme
</del><span class="cx"> #define WTF_USE_NEW_THEME 1
</span><del>-#endif // PLATFORM(MAC)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> #ifndef CGFLOAT_DEFINED
</span><span class="lines">@@ -120,11 +119,6 @@
</span><span class="cx"> #define WTF_USE_SAFARI_THEME 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// 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
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define WEBCORE_NAVIGATOR_PLATFORM wkGetPlatformNameForNavigator();
</span><span class="cx"> #define WEBCORE_NAVIGATOR_VENDOR wkGetVendorNameForNavigator();
</span></span></pre>
</div>
</div>
</body>
</html>