Changeset 273303 in webkit
- Timestamp:
- Feb 23, 2021 5:01:29 AM (3 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r273287 r273303 1 2021-02-23 Frederic Wang <fwang@igalia.com> 2 3 [GTK] Use std::bitset to specify WebKitTestServer's options 4 https://bugs.webkit.org/show_bug.cgi?id=222273 5 6 Reviewed by Carlos Garcia Campos. 7 8 * TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp: 9 (beforeAll): 10 * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp: 11 (WebKitTestServer::WebKitTestServer): 12 * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h: 13 1 14 2021-02-22 Alex Christensen <achristensen@webkit.org> 2 15 -
trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp
r273236 r273303 566 566 kHttpsServer->run(httpsServerCallback); 567 567 568 kHttpServer = new WebKitTestServer( WebKitTestServer::ServerHTTP);568 kHttpServer = new WebKitTestServer(); 569 569 kHttpServer->run(httpServerCallback); 570 570 -
trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp
r273236 r273303 26 26 #include <wtf/threads/BinarySemaphore.h> 27 27 28 WebKitTestServer::WebKitTestServer(ServerOptions options)28 WebKitTestServer::WebKitTestServer(ServerOptionsBitSet options) 29 29 { 30 if (options & ServerRunInThread) {30 if (options[ServerRunInThread]) { 31 31 WTF::initialize(); 32 32 m_queue = WorkQueue::create("WebKitTestServer"); … … 35 35 m_soupServer = adoptGRef(soup_server_new("server-header", "WebKitTestServer ", nullptr)); 36 36 37 if (options & ServerHTTPS) {37 if (options[ServerHTTPS]) { 38 38 CString resourcesDir = Test::getResourcesDir(); 39 39 GUniquePtr<char> sslCertificateFile(g_build_filename(resourcesDir.data(), "test-cert.pem", nullptr)); -
trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.h
r272984 r273303 20 20 #pragma once 21 21 22 #include <bitset> 22 23 #include <libsoup/soup.h> 23 24 #include <wtf/URL.h> … … 31 32 32 33 enum ServerOptions { 33 ServerHTTP = 0, 34 ServerHTTPS = 1 << 1, 35 ServerRunInThread = 1 << 2, 34 ServerHTTPS = 0, 35 ServerRunInThread = 1, 36 36 }; 37 using ServerOptionsBitSet = std::bitset<2>; 37 38 38 WebKitTestServer(ServerOptions = ServerHTTP); 39 WebKitTestServer(ServerOptionsBitSet = 0); 40 WebKitTestServer(ServerOptions option) 41 : WebKitTestServer(ServerOptionsBitSet().set(option)) { } 39 42 40 43 const URL& baseURL() const { return m_baseURL; }
Note: See TracChangeset
for help on using the changeset viewer.