- Revision
- 163961
- Author
- m...@apple.com
- Date
- 2014-02-12 09:57:05 -0800 (Wed, 12 Feb 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163960 => 163961)
--- 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)
@@ -1,3 +1,25 @@
+2014-02-12 Dan Bernstein <m...@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.
+
2014-02-11 Brent Fulgham <bfulg...@apple.com>
Remove some unintended copies in ranged for loops
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (163960 => 163961)
--- 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)
@@ -149,7 +149,7 @@
void DatabaseProcess::createDatabaseToWebProcessConnection()
{
-#if PLATFORM(MAC)
+#if OS(DARWIN)
// Create the listening port.
mach_port_t listeningPort;
mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
@@ -165,7 +165,7 @@
#endif
}
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
{
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (163960 => 163961)
--- 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)
@@ -65,7 +65,7 @@
NetworkProcess::NetworkProcess()
: m_hasSetCacheModel(false)
, m_cacheModel(CacheModelDocumentViewer)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
, m_clearCacheDispatchGroup(0)
#endif
{
@@ -190,7 +190,7 @@
void NetworkProcess::createNetworkConnectionToWebProcess()
{
-#if PLATFORM(MAC)
+#if OS(DARWIN)
// Create the listening port.
mach_port_t listeningPort;
mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
@@ -267,7 +267,7 @@
ChildProcess::terminate();
}
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
{
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (163960 => 163961)
--- 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)
@@ -133,7 +133,7 @@
typedef HashMap<const char*, OwnPtr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
NetworkProcessSupplementMap m_supplements;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
// FIXME: We'd like to be able to do this without the #ifdef, but WorkQueue + BinarySemaphore isn't good enough since
// multiple requests to clear the cache can come in before previous requests complete, and we need to wait for all of them.
// In the future using WorkQueue and a counting semaphore would work, as would WorkQueue supporting the libdispatch concept of "work groups".
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (163960 => 163961)
--- 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)
@@ -40,8 +40,8 @@
DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)
CancelDownload(uint64_t downloadID)
-#if PLATFORM(MAC)
SetProcessSuppressionEnabled(bool flag)
+#if PLATFORM(COCOA)
SetQOS(int latencyQOS, int throughputQOS)
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (163960 => 163961)
--- 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)
@@ -243,7 +243,7 @@
void NetworkResourceLoader::continueWillSendRequest(const ResourceRequest& newRequest)
{
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest.nsURLRequest(DoNotUpdateHTTPBody));
#elif USE(SOUP)
// FIXME: Implement ResourceRequest::updateFromDelegatePreservingOldHTTPBody. See https://bugs.webkit.org/show_bug.cgi?id=126127.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (163960 => 163961)
--- 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)
@@ -104,7 +104,7 @@
virtual void didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef) override;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
static size_t fileBackedResourceMinimumSize();
#if !PLATFORM(IOS)
virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override;
Modified: trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h (163960 => 163961)
--- 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)
@@ -48,7 +48,7 @@
RemoteNetworkingContext(uint64_t sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
: m_sessionID(sessionID)
, m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
, m_needsSiteSpecificQuirks(false)
, m_localFileContentSniffingEnabled(false)
#endif
@@ -57,7 +57,7 @@
virtual bool isValid() const override;
virtual WebCore::NetworkStorageSession& storageSession() const override;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
void setNeedsSiteSpecificQuirks(bool value) { m_needsSiteSpecificQuirks = value; }
virtual bool needsSiteSpecificQuirks() const override;
void setLocalFileContentSniffingEnabled(bool value) { m_localFileContentSniffingEnabled = value; }
@@ -69,7 +69,7 @@
uint64_t m_sessionID;
bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
bool m_needsSiteSpecificQuirks;
bool m_localFileContentSniffingEnabled;
#endif
