<!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>[163961] 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/163961">163961</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 09:57:05 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WebKit2/{Database,Network}Process except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128659
Reviewed by Anders Carlsson.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::createDatabaseToWebProcessConnection): Changed PLATFORM(MAC) to
OS(DARWIN) around use of Mach-based IPC.
Changed PLATFORM(MAC) to PLATFORM(COCOA) elsewhere in this file.
* NetworkProcess/NetworkProcess.cpp: Ditto.
(WebKit::NetworkProcess::NetworkProcess):
(WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
* NetworkProcess/NetworkProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* NetworkProcess/NetworkProcess.messages.in: Removed PLATFORM(MAC) guard around
SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
* NetworkProcess/NetworkResourceLoader.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
(WebKit::NetworkResourceLoader::continueWillSendRequest):
* NetworkProcess/NetworkResourceLoader.h: Ditto.
* NetworkProcess/RemoteNetworkingContext.h: Ditto, matching WebCore::NetworkingContext.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth">trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-02-12 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in WebKit2/{Database,Network}Process except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128659
+
+ Reviewed by Anders Carlsson.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::createDatabaseToWebProcessConnection): Changed PLATFORM(MAC) to
+ OS(DARWIN) around use of Mach-based IPC.
+ Changed PLATFORM(MAC) to PLATFORM(COCOA) elsewhere in this file.
+ * NetworkProcess/NetworkProcess.cpp: Ditto.
+ (WebKit::NetworkProcess::NetworkProcess):
+ (WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
+ * NetworkProcess/NetworkProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * NetworkProcess/NetworkProcess.messages.in: Removed PLATFORM(MAC) guard around
+ SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
+ * NetworkProcess/NetworkResourceLoader.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA)
+ (WebKit::NetworkResourceLoader::continueWillSendRequest):
+ * NetworkProcess/NetworkResourceLoader.h: Ditto.
+ * NetworkProcess/RemoteNetworkingContext.h: Ditto, matching WebCore::NetworkingContext.
+
</ins><span class="cx"> 2014-02-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some unintended copies in ranged for loops
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::createDatabaseToWebProcessConnection()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> // Create the listening port.
</span><span class="cx"> mach_port_t listeningPort;
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> NetworkProcess::NetworkProcess()
</span><span class="cx"> : m_hasSetCacheModel(false)
</span><span class="cx"> , m_cacheModel(CacheModelDocumentViewer)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_clearCacheDispatchGroup(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::createNetworkConnectionToWebProcess()
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> // Create the listening port.
</span><span class="cx"> mach_port_t listeningPort;
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> ChildProcess::terminate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> typedef HashMap<const char*, OwnPtr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
</span><span class="cx"> NetworkProcessSupplementMap m_supplements;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // FIXME: We'd like to be able to do this without the #ifdef, but WorkQueue + BinarySemaphore isn't good enough since
</span><span class="cx"> // multiple requests to clear the cache can come in before previous requests complete, and we need to wait for all of them.
</span><span class="cx"> // In the future using WorkQueue and a counting semaphore would work, as would WorkQueue supporting the libdispatch concept of "work groups".
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)
</span><span class="cx"> CancelDownload(uint64_t downloadID)
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> SetQOS(int latencyQOS, int throughputQOS)
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::continueWillSendRequest(const ResourceRequest& newRequest)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest.nsURLRequest(DoNotUpdateHTTPBody));
</span><span class="cx"> #elif USE(SOUP)
</span><span class="cx"> // FIXME: Implement ResourceRequest::updateFromDelegatePreservingOldHTTPBody. See https://bugs.webkit.org/show_bug.cgi?id=126127.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> virtual void didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> static size_t fileBackedResourceMinimumSize();
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h (163960 => 163961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-02-12 17:14:23 UTC (rev 163960)
+++ trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-02-12 17:57:05 UTC (rev 163961)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> RemoteNetworkingContext(uint64_t sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</span><span class="cx"> : m_sessionID(sessionID)
</span><span class="cx"> , m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> , m_needsSiteSpecificQuirks(false)
</span><span class="cx"> , m_localFileContentSniffingEnabled(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> virtual bool isValid() const override;
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const override;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void setNeedsSiteSpecificQuirks(bool value) { m_needsSiteSpecificQuirks = value; }
</span><span class="cx"> virtual bool needsSiteSpecificQuirks() const override;
</span><span class="cx"> void setLocalFileContentSniffingEnabled(bool value) { m_localFileContentSniffingEnabled = value; }
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> uint64_t m_sessionID;
</span><span class="cx"> bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> bool m_needsSiteSpecificQuirks;
</span><span class="cx"> bool m_localFileContentSniffingEnabled;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>