Changeset 284710 in webkit

Timestamp:

Oct 22, 2021, 12:50:43 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Use C++17 nested namespace syntax for WebKit::PCM
​https://bugs.webkit.org/show_bug.cgi?id=232162

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-10-22
Reviewed by Yusuke Suzuki.

• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.h:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.h:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h:
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp:
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementConnectionCocoa.mm:
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm:
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h:
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm:
• Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonConnectionSet.mm:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.h (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.h (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementConnectionCocoa.mm (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm (modified) (2 diffs)
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h (modified) (1 diff)
• NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm (modified) (2 diffs)
• Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonConnectionSet.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-22  Alex Christensen  <achristensen@webkit.org>
+
+        Use C++17 nested namespace syntax for WebKit::PCM
+        https://bugs.webkit.org/show_bug.cgi?id=232162
+
+        Reviewed by Yusuke Suzuki.
+
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.h:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.h:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h:
+        * NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp:
+        * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementConnectionCocoa.mm:
+        * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm:
+        * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h:
+        * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm:
+        * Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonConnectionSet.mm:
+
 2021-10-22  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementClientImpl.cpp

@@ -30 +30 @@
 #include "NetworkSession.h"
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 ClientImpl::ClientImpl(NetworkSession& session, NetworkProcess& networkProcess)
@@ -60 +58 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.cpp

@@ -29 +29 @@
 #include "NetworkSession.h"
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 Connection::Connection(CString&& machServiceName, NetworkSession& networkSession)
@@ -45 +43 @@
 #endif
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.cpp

@@ -31 +31 @@
 #endif
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 void DaemonClient::broadcastConsoleMessage(JSC::MessageLevel level, const String& message)
@@ -59 +57 @@
 }
 
-} // namespace PCM
-
 } // namespace WebKit

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.h

@@ -30 +30 @@
 #include <wtf/WeakPtr.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 class DaemonClient : public Client, public CanMakeWeakPtr<DaemonClient> {
@@ -42 +40 @@
 };
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp

@@ -35 +35 @@
 #include <WebCore/SQLiteTransaction.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 constexpr auto setUnattributedPrivateClickMeasurementAsExpiredQuery = "UPDATE UnattributedPrivateClickMeasurement SET timeOfAdClick = -1.0"_s;
@@ -760 +758 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h

@@ -30 +30 @@
 #include <wtf/ThreadSafeRefCounted.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 struct DebugInfo;
@@ -105 +103 @@
 };
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.cpp

@@ -27 +27 @@
 #include "PrivateClickMeasurementDebugInfo.h"
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 DebugInfo DebugInfo::isolatedCopy() const
@@ -41 +39 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.h

@@ -29 +29 @@
 #include <wtf/text/WTFString.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 struct DebugInfo {
@@ -47 +45 @@
 };
 
-} // namespace PCM
-
 } // namespace WebKit

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.cpp

@@ -39 +39 @@
 #endif
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 namespace MessageInfo {
@@ -313 +311 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp

@@ -32 +32 @@
 #include "WebCoreArgumentCoders.h"
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 template<MessageType messageType, typename... Args>
@@ -166 +164 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp

@@ -31 +31 @@
 #include <WebCore/ResourceResponse.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 #if !PLATFORM(COCOA)
@@ -49 +47 @@
 #endif
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.h

@@ -36 +36 @@
 }
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 class NetworkLoader {
@@ -48 +46 @@
 };
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp

@@ -34 +34 @@
 #include <wtf/SuspendableWorkQueue.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 static Ref<SuspendableWorkQueue> sharedWorkQueue()
@@ -189 +187 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementConnectionCocoa.mm

@@ -31 +31 @@
 #import <wtf/NeverDestroyed.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 void Connection::newConnectionWasInitialized() const
@@ -70 +68 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm

@@ -76 +76 @@
 @end
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 enum LoadTaskIdentifierType { };
@@ -139 +137 @@
 }
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h

@@ -29 +29 @@
 #include <wtf/spi/darwin/XPCSPI.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 void addVersionAndEncodedMessageToDictionary(Vector<uint8_t>&&, xpc_object_t);
 
-} // namespace PCM
-
-} // namespace WebKit
+} // namespace WebKit::PCM

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm

@@ -31 +31 @@
 #import <wtf/OSObjectPtr.h>
 
-namespace WebKit {
-
-namespace PCM {
+namespace WebKit::PCM {
 
 void addVersionAndEncodedMessageToDictionary(Vector<uint8_t>&& message, xpc_object_t dictionary)
@@ -42 +40 @@
 }
 
-} // namespace PCM
-
 } // namespace WebKit

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonConnectionSet.mm

@@ -32 +32 @@
 #import <wtf/RunLoop.h>
 
-namespace WebKit {
-namespace PCM {
+namespace WebKit::PCM {
 
 DaemonConnectionSet& DaemonConnectionSet::singleton()
@@ -92 +91 @@
 }
 
-} // namespace PCM
-} // namespace WebKit
+} // namespace WebKit::PCM