Changeset 163961 in webkit

Timestamp:

Feb 12, 2014 9:57:05 AM (10 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• DatabaseProcess/DatabaseProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.cpp (modified) (3 diffs)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.h (modified) (1 diff)
• NetworkProcess/RemoteNetworkingContext.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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.
+
 2014-02-11  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp

@@ -150 +150 @@
 void DatabaseProcess::createDatabaseToWebProcessConnection()
 {
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     // Create the listening port.
     mach_port_t listeningPort;
@@ -166 +166 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
 {

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -66 +66 @@
     : m_hasSetCacheModel(false)
     , m_cacheModel(CacheModelDocumentViewer)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     , m_clearCacheDispatchGroup(0)
 #endif
@@ -191 +191 @@
 void NetworkProcess::createNetworkConnectionToWebProcess()
 {
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     // Create the listening port.
     mach_port_t listeningPort;
@@ -268 +268 @@
 }
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(COCOA)
 void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
 {

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -134 +134 @@
     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.

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in

@@ -41 +41 @@
     CancelDownload(uint64_t downloadID)
 
-#if PLATFORM(MAC)
     SetProcessSuppressionEnabled(bool flag)
+#if PLATFORM(COCOA)
     SetQOS(int latencyQOS, int throughputQOS)
 #endif

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -244 +244 @@
 void NetworkResourceLoader::continueWillSendRequest(const ResourceRequest& newRequest)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest.nsURLRequest(DoNotUpdateHTTPBody));
 #elif USE(SOUP)

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

@@ -105 +105 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     static size_t fileBackedResourceMinimumSize();
 #if !PLATFORM(IOS)

trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h

@@ -49 +49 @@
         : m_sessionID(sessionID)
         , m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         , m_needsSiteSpecificQuirks(false)
         , m_localFileContentSniffingEnabled(false)
@@ -58 +58 @@
     virtual WebCore::NetworkStorageSession& storageSession() const override;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     void setNeedsSiteSpecificQuirks(bool value) { m_needsSiteSpecificQuirks = value; }
     virtual bool needsSiteSpecificQuirks() const override;
@@ -70 +70 @@
     bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     bool m_needsSiteSpecificQuirks;
     bool m_localFileContentSniffingEnabled;