<!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>[163862] trunk/Source/WebKit2</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/163862">163862</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 22:21:41 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WebKit2/platform except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128513
Reviewed by Dean Jackson.
* Platform/IPC/Connection.cpp:
(IPC::Connection::waitForSyncReply): Changed PLATFORM(MAC) to PLATFORM(COCOA) around use of
RunLoop::runForDuration, matching the guard around that function.
* Platform/Logging.cpp: Deleted unused definition of logLevelString.
* Platform/Module.cpp:
(WebKit::Module::Module): Changed PLATFORM(MAC) to USE(CF).
* Platform/Module.h: Changed PLATFORM(MAC) to USE(CF), since the “Mac” implementation is
just a CFBundle-based implementation.
* Platform/PlatformProcessIdentifier.h: Changed PLATFORM(MAC) to PLATFORM(COCOA). Arguably
this should be OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
* Platform/cf: Added.
* Platform/cf/ModuleCF.cpp: Renamed from Platform/mac/ModuleMac.mm. This file did not
contain any Objective-C code.
* Platform/foundation: Added.
* Platform/foundation/LoggingFoundation.mm: Renamed from Platform/mac/Logging.mac.mm.
* Platform/mac/Logging.mac.mm: Removed.
* Platform/mac/ModuleMac.mm: Removed.
* WebKit2.xcodeproj/project.pbxproj: Updated for renames.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingcpp">trunk/Source/WebKit2/Platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformModulecpp">trunk/Source/WebKit2/Platform/Module.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformModuleh">trunk/Source/WebKit2/Platform/Module.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformPlatformProcessIdentifierh">trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/Platform/cf/</li>
<li><a href="#trunkSourceWebKit2PlatformcfModuleCFcpp">trunk/Source/WebKit2/Platform/cf/ModuleCF.cpp</a></li>
<li>trunk/Source/WebKit2/Platform/foundation/</li>
<li><a href="#trunkSourceWebKit2PlatformfoundationLoggingFoundationmm">trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2PlatformmacLoggingmacmm">trunk/Source/WebKit2/Platform/mac/Logging.mac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacModuleMacmm">trunk/Source/WebKit2/Platform/mac/ModuleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-02-10 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in WebKit2/platform except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128513
+
+ Reviewed by Dean Jackson.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::waitForSyncReply): Changed PLATFORM(MAC) to PLATFORM(COCOA) around use of
+ RunLoop::runForDuration, matching the guard around that function.
+ * Platform/Logging.cpp: Deleted unused definition of logLevelString.
+ * Platform/Module.cpp:
+ (WebKit::Module::Module): Changed PLATFORM(MAC) to USE(CF).
+ * Platform/Module.h: Changed PLATFORM(MAC) to USE(CF), since the “Mac” implementation is
+ just a CFBundle-based implementation.
+ * Platform/PlatformProcessIdentifier.h: Changed PLATFORM(MAC) to PLATFORM(COCOA). Arguably
+ this should be OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
+ * Platform/cf: Added.
+ * Platform/cf/ModuleCF.cpp: Renamed from Platform/mac/ModuleMac.mm. This file did not
+ contain any Objective-C code.
+ * Platform/foundation: Added.
+ * Platform/foundation/LoggingFoundation.mm: Renamed from Platform/mac/Logging.mac.mm.
+ * Platform/mac/Logging.mac.mm: Removed.
+ * Platform/mac/ModuleMac.mm: Removed.
+ * WebKit2.xcodeproj/project.pbxproj: Updated for renames.
+
</ins><span class="cx"> 2014-02-10 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163848.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> // This allows the WebProcess to still serve clients while waiting for the message to return.
</span><span class="cx"> // Notably, it can continue to process accessibility requests, which are on the main thread.
</span><span class="cx"> if (syncSendFlags & SpinRunLoopWhileWaitingForReply) {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: Although we run forever, any events incoming will cause us to drop out and exit out. This however doesn't
</span><span class="cx"> // account for a timeout value passed in. Timeout is always NoTimeout in these cases, but that could change.
</span><span class="cx"> RunLoop::current()->runForDuration(1e10);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.cpp (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Logging.cpp 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/Logging.cpp 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -66,14 +66,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
-String logLevelString()
-{
- // FIXME: Each platform will need to define their own logLevelString();
- return emptyString();
-}
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // !LOG_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformModulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Module.cpp (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Module.cpp 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/Module.cpp 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> Module::Module(const String& path)
</span><span class="cx"> : m_path(path)
</span><del>-#if PLATFORM(MAC) && !defined(__LP64__)
</del><ins>+#if USE(CF) && !defined(__LP64__)
</ins><span class="cx"> , m_bundleResourceMap(-1)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformModuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Module.h (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Module.h 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/Module.h 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(CF)
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx"> // live Objective-C objects whose methods come from that bundle.
</span><span class="cx"> void unload();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(CF)
</ins><span class="cx"> String bundleIdentifier() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template<typename FunctionType> FunctionType functionPointer(const char* functionName) const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !defined(__LP64__)
</del><ins>+#if USE(CF) && !defined(__LP64__)
</ins><span class="cx"> CFBundleRefNum bundleResourceMap();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> void* platformFunctionPointer(const char* functionName) const;
</span><span class="cx">
</span><span class="cx"> String m_path;
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(CF)
</ins><span class="cx"> RetainPtr<CFBundleRef> m_bundle;
</span><span class="cx"> #if !defined(__LP64__)
</span><span class="cx"> CFBundleRefNum m_bundleResourceMap;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformPlatformProcessIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> typedef pid_t PlatformProcessIdentifier;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef int PlatformProcessIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformcfModuleCFcppfromrev163859trunkSourceWebKit2PlatformmacModuleMacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Platform/cf/ModuleCF.cpp (from rev 163859, trunk/Source/WebKit2/Platform/mac/ModuleMac.mm) (0 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/cf/ModuleCF.cpp (rev 0)
+++ trunk/Source/WebKit2/Platform/cf/ModuleCF.cpp 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -0,0 +1,86 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Module.h"
+
+namespace WebKit {
+
+bool Module::load()
+{
+ RetainPtr<CFURLRef> bundleURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, m_path.createCFString().get(), kCFURLPOSIXPathStyle, FALSE));
+ if (!bundleURL)
+ return false;
+
+ RetainPtr<CFBundleRef> bundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, bundleURL.get()));
+ if (!bundle)
+ return false;
+
+ if (!CFBundleLoadExecutable(bundle.get()))
+ return false;
+
+ m_bundle = adoptCF(bundle.leakRef());
+ return true;
+}
+
+void Module::unload()
+{
+ if (!m_bundle)
+ return;
+
+#if !defined(__LP64__)
+ if (m_bundleResourceMap != -1)
+ CFBundleCloseBundleResourceMap(m_bundle.get(), m_bundleResourceMap);
+#endif
+
+ // See the comment in Module.h for why we leak the bundle here.
+ CFBundleRef unused = m_bundle.leakRef();
+ (void)unused;
+}
+
+void* Module::platformFunctionPointer(const char* functionName) const
+{
+ if (!m_bundle)
+ return 0;
+ RetainPtr<CFStringRef> functionNameString = adoptCF(CFStringCreateWithCStringNoCopy(kCFAllocatorDefault, functionName, kCFStringEncodingASCII, kCFAllocatorNull));
+ return CFBundleGetFunctionPointerForName(m_bundle.get(), functionNameString.get());
+}
+
+String Module::bundleIdentifier() const
+{
+ return CFBundleGetIdentifier(m_bundle.get());
+}
+
+#if !defined(__LP64__)
+CFBundleRefNum Module::bundleResourceMap()
+{
+ if (m_bundleResourceMap == -1)
+ m_bundleResourceMap = CFBundleOpenBundleResourceMap(m_bundle.get());
+
+ return m_bundleResourceMap;
+}
+#endif
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformfoundationLoggingFoundationmmfromrev163859trunkSourceWebKit2PlatformmacLoggingmacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm (from rev 163859, trunk/Source/WebKit2/Platform/mac/Logging.mac.mm) (0 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm (rev 0)
+++ trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Logging.h"
+
+namespace WebKit {
+
+#if !LOG_DISABLED
+
+static NSString * const defaultsDomain = @"WebKit2Logging";
+
+String logLevelString()
+{
+ return [[NSUserDefaults standardUserDefaults] stringForKey:defaultsDomain];
+}
+
+#endif
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLoggingmacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Platform/mac/Logging.mac.mm (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/Logging.mac.mm 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/mac/Logging.mac.mm 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Logging.h"
-
-namespace WebKit {
-
-#if !LOG_DISABLED
-
-static NSString * const defaultsDomain = @"WebKit2Logging";
-
-String logLevelString()
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:defaultsDomain];
-}
-
-#endif
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacModuleMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Platform/mac/ModuleMac.mm (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/ModuleMac.mm 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/Platform/mac/ModuleMac.mm 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -1,86 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "Module.h"
-
-namespace WebKit {
-
-bool Module::load()
-{
- RetainPtr<CFURLRef> bundleURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, m_path.createCFString().get(), kCFURLPOSIXPathStyle, FALSE));
- if (!bundleURL)
- return false;
-
- RetainPtr<CFBundleRef> bundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, bundleURL.get()));
- if (!bundle)
- return false;
-
- if (!CFBundleLoadExecutable(bundle.get()))
- return false;
-
- m_bundle = adoptCF(bundle.leakRef());
- return true;
-}
-
-void Module::unload()
-{
- if (!m_bundle)
- return;
-
-#if !defined(__LP64__)
- if (m_bundleResourceMap != -1)
- CFBundleCloseBundleResourceMap(m_bundle.get(), m_bundleResourceMap);
-#endif
-
- // See the comment in Module.h for why we leak the bundle here.
- CFBundleRef unused = m_bundle.leakRef();
- (void)unused;
-}
-
-void* Module::platformFunctionPointer(const char* functionName) const
-{
- if (!m_bundle)
- return 0;
- RetainPtr<CFStringRef> functionNameString = adoptCF(CFStringCreateWithCStringNoCopy(kCFAllocatorDefault, functionName, kCFStringEncodingASCII, kCFAllocatorNull));
- return CFBundleGetFunctionPointerForName(m_bundle.get(), functionNameString.get());
-}
-
-String Module::bundleIdentifier() const
-{
- return CFBundleGetIdentifier(m_bundle.get());
-}
-
-#if !defined(__LP64__)
-CFBundleRefNum Module::bundleResourceMap()
-{
- if (m_bundleResourceMap == -1)
- m_bundleResourceMap = CFBundleOpenBundleResourceMap(m_bundle.get());
-
- return m_bundleResourceMap;
-}
-#endif
-
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163861 => 163862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-11 06:20:56 UTC (rev 163861)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-11 06:21:41 UTC (rev 163862)
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> 515E7730184015800007203F /* UniqueIDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E772E184015800007203F /* UniqueIDBDatabase.h */; };
</span><span class="cx"> 515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */; };
</span><span class="cx"> 515E773418402D510007203F /* UniqueIDBDatabaseIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */; };
</span><del>- 5160BFE113381DF900918999 /* Logging.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* Logging.mac.mm */; };
</del><ins>+ 5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* LoggingFoundation.mm */; };
</ins><span class="cx"> 516311871858446600534647 /* WebCrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 516311861858446600534647 /* WebCrossThreadCopier.h */; };
</span><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
</span><span class="cx"> 5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
</span><span class="lines">@@ -1344,7 +1344,7 @@
</span><span class="cx"> C0CE72A01247E71D00BC0EC4 /* WebPageMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */; };
</span><span class="cx"> C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CE729F1247E71D00BC0EC4 /* WebPageMessages.h */; };
</span><span class="cx"> C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CE72AC1247E78D00BC0EC4 /* HandleMessage.h */; };
</span><del>- C0E3AA7A1209E83000A49D01 /* ModuleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA481209E45000A49D01 /* ModuleMac.mm */; };
</del><ins>+ C0E3AA7A1209E83000A49D01 /* ModuleCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA481209E45000A49D01 /* ModuleCF.cpp */; };
</ins><span class="cx"> C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA451209E2BA00A49D01 /* Module.cpp */; };
</span><span class="cx"> C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E3AA441209E2BA00A49D01 /* Module.h */; };
</span><span class="cx"> C517388112DF8F4F00EE3F47 /* DragControllerAction.h in Headers */ = {isa = PBXBuildFile; fileRef = C517388012DF8F4F00EE3F47 /* DragControllerAction.h */; };
</span><span class="lines">@@ -2433,7 +2433,7 @@
</span><span class="cx"> 515E772E184015800007203F /* UniqueIDBDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabase.h; sourceTree = "<group>"; };
</span><span class="cx"> 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseIdentifier.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseIdentifier.h; sourceTree = "<group>"; };
</span><del>- 5160BFE013381DF900918999 /* Logging.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Logging.mac.mm; sourceTree = "<group>"; };
</del><ins>+ 5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
</span><span class="cx"> 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseBackingStoreSQLite.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3133,7 +3133,7 @@
</span><span class="cx"> C0CE73371247F70E00BC0EC4 /* generate-messages-header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-messages-header.py"; sourceTree = "<group>"; };
</span><span class="cx"> C0E3AA441209E2BA00A49D01 /* Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Module.h; sourceTree = "<group>"; };
</span><span class="cx"> C0E3AA451209E2BA00A49D01 /* Module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Module.cpp; sourceTree = "<group>"; };
</span><del>- C0E3AA481209E45000A49D01 /* ModuleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ModuleMac.mm; sourceTree = "<group>"; };
</del><ins>+ C0E3AA481209E45000A49D01 /* ModuleCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleCF.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> C517388012DF8F4F00EE3F47 /* DragControllerAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragControllerAction.h; sourceTree = "<group>"; };
</span><span class="cx"> C5237F5F12441CA300780472 /* WebEditorClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEditorClientMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> C524538F189C6B85003DF476 /* WKActionSheetAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKActionSheetAssistant.h; path = ios/WKActionSheetAssistant.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3756,10 +3756,8 @@
</span><span class="cx"> children = (
</span><span class="cx"> BCE0937614FB128B001138D9 /* LayerHostingContext.h */,
</span><span class="cx"> BCE0937514FB128B001138D9 /* LayerHostingContext.mm */,
</span><del>- 5160BFE013381DF900918999 /* Logging.mac.mm */,
</del><span class="cx"> 1A24B5F011F531E800C38269 /* MachUtilities.cpp */,
</span><span class="cx"> 1A24B5F111F531E800C38269 /* MachUtilities.h */,
</span><del>- C0E3AA481209E45000A49D01 /* ModuleMac.mm */,
</del><span class="cx"> 1A24BF39120896A600FBB059 /* SharedMemoryMac.cpp */,
</span><span class="cx"> 296BD85B15019BC30071F424 /* StringUtilities.h */,
</span><span class="cx"> 296BD85C15019BC30071F424 /* StringUtilities.mm */,
</span><span class="lines">@@ -4334,6 +4332,22 @@
</span><span class="cx"> name = cf;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 3709504118A88BA40087AE5D /* cf */ = {
+ isa = PBXGroup;
+ children = (
+ C0E3AA481209E45000A49D01 /* ModuleCF.cpp */,
+ );
+ path = cf;
+ sourceTree = "<group>";
+ };
+ 3709504218A88CDE0087AE5D /* foundation */ = {
+ isa = PBXGroup;
+ children = (
+ 5160BFE013381DF900918999 /* LoggingFoundation.mm */,
+ );
+ path = foundation;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5501,7 +5515,9 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 1AE00D6818327C1200087DD7 /* IPC */,
</span><ins>+ 3709504118A88BA40087AE5D /* cf */,
</ins><span class="cx"> 1AA2E51A12E4C05600BC4966 /* cg */,
</span><ins>+ 3709504218A88CDE0087AE5D /* foundation */,
</ins><span class="cx"> 1A7E814E1152D2240003695B /* mac */,
</span><span class="cx"> 51B15A7D138439B200321AD8 /* unix */,
</span><span class="cx"> 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */,
</span><span class="lines">@@ -7744,14 +7760,14 @@
</span><span class="cx"> 1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */,
</span><span class="cx"> 1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
</span><span class="cx"> 51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */,
</span><del>- 5160BFE113381DF900918999 /* Logging.mac.mm in Sources */,
</del><ins>+ 5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */,
</ins><span class="cx"> 1A24B5F211F531E800C38269 /* MachUtilities.cpp in Sources */,
</span><span class="cx"> 1A232902162C867300D82F7A /* MessageDecoder.cpp in Sources */,
</span><span class="cx"> 1A2328FE162C866A00D82F7A /* MessageEncoder.cpp in Sources */,
</span><span class="cx"> 1A3EED0E161A535400AEB4F5 /* MessageReceiverMap.cpp in Sources */,
</span><span class="cx"> 1A9E328E182165A900F5D04C /* WKRemoteObjectInterface.mm in Sources */,
</span><span class="cx"> C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */,
</span><del>- C0E3AA7A1209E83000A49D01 /* ModuleMac.mm in Sources */,
</del><ins>+ C0E3AA7A1209E83000A49D01 /* ModuleCF.cpp in Sources */,
</ins><span class="cx"> 370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */,
</span><span class="cx"> BCB0AEEA122F53E300B1341E /* MutableDictionary.cpp in Sources */,
</span><span class="cx"> C02BFF1E1251502E009CCBEA /* NativeWebKeyboardEventMac.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>