Changeset 273303 in webkit

Timestamp:

Feb 23, 2021 5:01:29 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Use std::bitset to specify WebKitTestServer's options
​https://bugs.webkit.org/show_bug.cgi?id=222273

Patch by Frederic Wang <​fwang@igalia.com> on 2021-02-23
Reviewed by Carlos Garcia Campos.

• TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp:

(beforeAll):

• TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:

(WebKitTestServer::WebKitTestServer):

• TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp (modified) (1 diff)
• TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp (modified) (2 diffs)
• TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-23  Frederic Wang  <fwang@igalia.com>
+
+        [GTK] Use std::bitset to specify WebKitTestServer's options
+        https://bugs.webkit.org/show_bug.cgi?id=222273
+
+        Reviewed by Carlos Garcia Campos.
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp:
+        (beforeAll):
+        * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:
+        (WebKitTestServer::WebKitTestServer):
+        * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h:
+
 2021-02-22  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp

@@ -566 +566 @@
     kHttpsServer->run(httpsServerCallback);
 
-    kHttpServer = new WebKitTestServer(WebKitTestServer::ServerHTTP);
+    kHttpServer = new WebKitTestServer();
     kHttpServer->run(httpServerCallback);
 

trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp

@@ -26 +26 @@
 #include <wtf/threads/BinarySemaphore.h>
 
-WebKitTestServer::WebKitTestServer(ServerOptions options)
+WebKitTestServer::WebKitTestServer(ServerOptionsBitSet options)
 {
-    if (options & ServerRunInThread) {
+    if (options[ServerRunInThread]) {
         WTF::initialize();
         m_queue = WorkQueue::create("WebKitTestServer");
@@ -35 +35 @@
     m_soupServer = adoptGRef(soup_server_new("server-header", "WebKitTestServer ", nullptr));
 
-    if (options & ServerHTTPS) {
+    if (options[ServerHTTPS]) {
         CString resourcesDir = Test::getResourcesDir();
         GUniquePtr<char> sslCertificateFile(g_build_filename(resourcesDir.data(), "test-cert.pem", nullptr));

trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h

@@ -20 +20 @@
 #pragma once
 
+#include <bitset>
 #include <libsoup/soup.h>
 #include <wtf/URL.h>
@@ -31 +32 @@
 
     enum ServerOptions {
-        ServerHTTP = 0,
-        ServerHTTPS = 1 << 1,
-        ServerRunInThread = 1 << 2,
+        ServerHTTPS = 0,
+        ServerRunInThread = 1,
     };
+    using ServerOptionsBitSet = std::bitset<2>;
 
-    WebKitTestServer(ServerOptions = ServerHTTP);
+    WebKitTestServer(ServerOptionsBitSet = 0);
+    WebKitTestServer(ServerOptions option)
+        : WebKitTestServer(ServerOptionsBitSet().set(option)) { }
 
     const URL& baseURL() const { return m_baseURL; }