diff --git a/Ladybird/Android/src/main/cpp/WebContentService.cpp b/Ladybird/Android/src/main/cpp/WebContentService.cpp index dabcc89961c..3af131daa3c 100644 --- a/Ladybird/Android/src/main/cpp/WebContentService.cpp +++ b/Ladybird/Android/src/main/cpp/WebContentService.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,9 +32,9 @@ #include #include -static ErrorOr> bind_request_server_service() +static ErrorOr> bind_request_server_service() { - return bind_service(&bind_request_server_java); + return bind_service(&bind_request_server_java); } static ErrorOr> bind_image_decoder_service() diff --git a/Ladybird/AppKit/Application/ApplicationBridge.cpp b/Ladybird/AppKit/Application/ApplicationBridge.cpp index d5c8a10ecc5..8dfa8908a21 100644 --- a/Ladybird/AppKit/Application/ApplicationBridge.cpp +++ b/Ladybird/AppKit/Application/ApplicationBridge.cpp @@ -9,16 +9,17 @@ #include #include #include -#include +#include #include namespace Ladybird { +// FIXME: LibProtocol is renamed to LibRequests, remove this workaround // Unfortunately, the Protocol namespace conflicts hard with a @Protocol interface defined by Objective-C. And the #define // trick we use for e.g. Duration does not work for Protocol. So here, we make sure that any use of the Protocol namespace // is limited to .cpp files (i.e. not .h files that an Objective-C file can include). struct ApplicationBridgeImpl { - RefPtr request_server_client; + RefPtr request_server_client; RefPtr image_decoder_client; }; diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index d46e7ae59c8..b1df0217bb1 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -90,7 +90,7 @@ else() set(LADYBIRD_TARGET ladybird PRIVATE) endif() -target_link_libraries(${LADYBIRD_TARGET} AK LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibJS LibMain LibWeb LibWebView LibProtocol LibURL) +target_link_libraries(${LADYBIRD_TARGET} AK LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibJS LibMain LibWeb LibWebView LibRequests LibURL) target_include_directories(${LADYBIRD_TARGET} ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Userland/) @@ -118,7 +118,7 @@ add_executable(headless-browser target_include_directories(headless-browser PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(headless-browser PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/) -target_link_libraries(headless-browser PRIVATE AK LibCore LibWeb LibWebView LibWebSocket LibCrypto LibFileSystem LibHTTP LibImageDecoderClient LibJS LibGfx LibMain LibTLS LibIPC LibDiff LibProtocol LibURL) +target_link_libraries(headless-browser PRIVATE AK LibCore LibWeb LibWebView LibWebSocket LibCrypto LibFileSystem LibHTTP LibImageDecoderClient LibJS LibGfx LibMain LibTLS LibIPC LibDiff LibRequests LibURL) add_custom_target(run COMMAND "${CMAKE_COMMAND}" -E env "LADYBIRD_SOURCE_DIR=${LADYBIRD_SOURCE_DIR}" "$" $ENV{LAGOM_ARGS} diff --git a/Ladybird/HelperProcess.cpp b/Ladybird/HelperProcess.cpp index d6e259b400d..ce7dded09c6 100644 --- a/Ladybird/HelperProcess.cpp +++ b/Ladybird/HelperProcess.cpp @@ -130,7 +130,7 @@ ErrorOr> launch_image_decoder_process( return launch_server_process("ImageDecoder"sv, candidate_image_decoder_paths, arguments); } -ErrorOr> launch_web_worker_process(ReadonlySpan candidate_web_worker_paths, RefPtr request_client) +ErrorOr> launch_web_worker_process(ReadonlySpan candidate_web_worker_paths, RefPtr request_client) { Vector arguments; if (request_client) { @@ -144,7 +144,7 @@ ErrorOr> launch_web_worker_process(Rea return launch_server_process("WebWorker"sv, candidate_web_worker_paths, move(arguments)); } -ErrorOr> launch_request_server_process(ReadonlySpan candidate_request_server_paths, StringView serenity_resource_root) +ErrorOr> launch_request_server_process(ReadonlySpan candidate_request_server_paths, StringView serenity_resource_root) { Vector arguments; @@ -161,10 +161,10 @@ ErrorOr> launch_request_server_process(Re arguments.append(server.value()); } - return launch_server_process("RequestServer"sv, candidate_request_server_paths, move(arguments)); + return launch_server_process("RequestServer"sv, candidate_request_server_paths, move(arguments)); } -ErrorOr connect_new_request_server_client(Protocol::RequestClient& client) +ErrorOr connect_new_request_server_client(Requests::RequestClient& client) { auto new_socket = client.send_sync_but_allow_failure(); if (!new_socket) diff --git a/Ladybird/HelperProcess.h b/Ladybird/HelperProcess.h index 548226801cc..08a5721c221 100644 --- a/Ladybird/HelperProcess.h +++ b/Ladybird/HelperProcess.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,8 +23,8 @@ ErrorOr> launch_web_content_process( Optional request_server_socket = {}); ErrorOr> launch_image_decoder_process(ReadonlySpan candidate_image_decoder_paths); -ErrorOr> launch_web_worker_process(ReadonlySpan candidate_web_worker_paths, RefPtr); -ErrorOr> launch_request_server_process(ReadonlySpan candidate_request_server_paths, StringView serenity_resource_root); +ErrorOr> launch_web_worker_process(ReadonlySpan candidate_web_worker_paths, RefPtr); +ErrorOr> launch_request_server_process(ReadonlySpan candidate_request_server_paths, StringView serenity_resource_root); -ErrorOr connect_new_request_server_client(Protocol::RequestClient&); +ErrorOr connect_new_request_server_client(Requests::RequestClient&); ErrorOr connect_new_image_decoder_client(ImageDecoderClient::Client&); diff --git a/Ladybird/Qt/Application.h b/Ladybird/Qt/Application.h index 33091b01ae5..51b807169e6 100644 --- a/Ladybird/Qt/Application.h +++ b/Ladybird/Qt/Application.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -29,7 +29,7 @@ public: virtual bool event(QEvent* event) override; Function on_open_file; - RefPtr request_server_client; + RefPtr request_server_client; NonnullRefPtr image_decoder_client() const { return *m_image_decoder_client; } ErrorOr initialize_image_decoder(); diff --git a/Ladybird/Qt/RequestManagerQt.cpp b/Ladybird/Qt/RequestManagerQt.cpp index d1156d618ca..aa43aff22b7 100644 --- a/Ladybird/Qt/RequestManagerQt.cpp +++ b/Ladybird/Qt/RequestManagerQt.cpp @@ -105,12 +105,12 @@ RequestManagerQt::Request::Request(QNetworkReply& reply) RequestManagerQt::Request::~Request() = default; -void RequestManagerQt::Request::set_buffered_request_finished_callback(Protocol::Request::BufferedRequestFinished on_buffered_request_finished) +void RequestManagerQt::Request::set_buffered_request_finished_callback(Requests::Request::BufferedRequestFinished on_buffered_request_finished) { this->on_buffered_request_finish = move(on_buffered_request_finished); } -void RequestManagerQt::Request::set_unbuffered_request_callbacks(Protocol::Request::HeadersReceived, Protocol::Request::DataReceived, Protocol::Request::RequestFinished on_request_finished) +void RequestManagerQt::Request::set_unbuffered_request_callbacks(Requests::Request::HeadersReceived, Requests::Request::DataReceived, Requests::Request::RequestFinished on_request_finished) { dbgln("Unbuffered requests are not yet supported with Qt networking"); on_request_finished(false, 0); diff --git a/Ladybird/Qt/RequestManagerQt.h b/Ladybird/Qt/RequestManagerQt.h index c4698a0f308..7880ab54886 100644 --- a/Ladybird/Qt/RequestManagerQt.h +++ b/Ladybird/Qt/RequestManagerQt.h @@ -43,8 +43,8 @@ private: virtual ~Request() override; - virtual void set_buffered_request_finished_callback(Protocol::Request::BufferedRequestFinished) override; - virtual void set_unbuffered_request_callbacks(Protocol::Request::HeadersReceived, Protocol::Request::DataReceived, Protocol::Request::RequestFinished) override; + virtual void set_buffered_request_finished_callback(Requests::Request::BufferedRequestFinished) override; + virtual void set_unbuffered_request_callbacks(Requests::Request::HeadersReceived, Requests::Request::DataReceived, Requests::Request::RequestFinished) override; virtual bool stop() override { return false; } void did_finish(); @@ -56,7 +56,7 @@ private: QNetworkReply& m_reply; - Protocol::Request::BufferedRequestFinished on_buffered_request_finish; + Requests::Request::BufferedRequestFinished on_buffered_request_finish; }; HashMap> m_pending; diff --git a/Ladybird/Qt/WebContentView.cpp b/Ladybird/Qt/WebContentView.cpp index cb2cda65d8f..b3a8084977f 100644 --- a/Ladybird/Qt/WebContentView.cpp +++ b/Ladybird/Qt/WebContentView.cpp @@ -131,7 +131,7 @@ WebContentView::WebContentView(QWidget* window, RefPtr request_server_client {}; + RefPtr request_server_client {}; if (WebView::Application::web_content_options().use_lagom_networking == WebView::UseLagomNetworking::Yes) request_server_client = static_cast(QApplication::instance())->request_server_client; diff --git a/Ladybird/Qt/main.cpp b/Ladybird/Qt/main.cpp index 3ff17aa0271..120b2fa9dde 100644 --- a/Ladybird/Qt/main.cpp +++ b/Ladybird/Qt/main.cpp @@ -124,8 +124,8 @@ ErrorOr serenity_main(Main::Arguments arguments) // FIXME: Create an abstraction to re-spawn the RequestServer and re-hook up its client hooks to each tab on crash if (app->web_content_options().use_lagom_networking == WebView::UseLagomNetworking::Yes) { auto request_server_paths = TRY(get_paths_for_helper_process("RequestServer"sv)); - auto protocol_client = TRY(launch_request_server_process(request_server_paths, s_ladybird_resource_root)); - app->request_server_client = move(protocol_client); + auto requests_client = TRY(launch_request_server_process(request_server_paths, s_ladybird_resource_root)); + app->request_server_client = move(requests_client); } TRY(app->initialize_image_decoder()); diff --git a/Ladybird/WebContent/CMakeLists.txt b/Ladybird/WebContent/CMakeLists.txt index d802d2ebef6..bfc01d31f98 100644 --- a/Ladybird/WebContent/CMakeLists.txt +++ b/Ladybird/WebContent/CMakeLists.txt @@ -34,7 +34,7 @@ target_include_directories(webcontent PUBLIC $) target_include_directories(webcontent PUBLIC $) -target_link_libraries(webcontent PUBLIC LibAudio LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibProtocol LibWebView LibImageDecoderClient) +target_link_libraries(webcontent PUBLIC LibAudio LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient) if (HAVE_PULSEAUDIO) target_compile_definitions(webcontent PUBLIC HAVE_PULSEAUDIO=1) diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index 429b444f3ab..47a9b5e4f05 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -248,7 +248,7 @@ ErrorOr initialize_lagom_networking(int request_server_socket) auto socket = TRY(Core::LocalSocket::adopt_fd(request_server_socket)); TRY(socket->set_blocking(true)); - auto new_client = TRY(try_make_ref_counted(move(socket))); + auto new_client = TRY(try_make_ref_counted(move(socket))); Web::ResourceLoader::initialize(TRY(WebView::RequestServerAdapter::try_create(move(new_client)))); return {}; diff --git a/Ladybird/WebWorker/CMakeLists.txt b/Ladybird/WebWorker/CMakeLists.txt index ce9898989f2..4d0a6f158f7 100644 --- a/Ladybird/WebWorker/CMakeLists.txt +++ b/Ladybird/WebWorker/CMakeLists.txt @@ -19,7 +19,7 @@ set_target_properties(webworker PROPERTIES AUTOMOC OFF AUTORCC OFF AUTOUIC OFF) target_include_directories(webworker PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/) target_include_directories(webworker PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/) target_include_directories(webworker PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) -target_link_libraries(webworker PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibProtocol LibWeb LibWebView LibUnicode LibImageDecoderClient LibMain LibURL) +target_link_libraries(webworker PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibRequests LibWeb LibWebView LibUnicode LibImageDecoderClient LibMain LibURL) if (HAS_FONTCONFIG) target_link_libraries(webworker PRIVATE Fontconfig::Fontconfig) diff --git a/Ladybird/WebWorker/main.cpp b/Ladybird/WebWorker/main.cpp index 62ec2c760a0..b88fde3ad31 100644 --- a/Ladybird/WebWorker/main.cpp +++ b/Ladybird/WebWorker/main.cpp @@ -86,7 +86,7 @@ static ErrorOr initialize_lagom_networking(int request_server_socket) auto socket = TRY(Core::LocalSocket::adopt_fd(request_server_socket)); TRY(socket->set_blocking(true)); - auto new_client = TRY(try_make_ref_counted(move(socket))); + auto new_client = TRY(try_make_ref_counted(move(socket))); Web::ResourceLoader::initialize(TRY(WebView::RequestServerAdapter::try_create(move(new_client)))); diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index f6a3cf17aa2..0a8c78a8ba9 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -390,8 +390,8 @@ set(lagom_standard_libraries IPC JS Line - Protocol Regex + Requests RIFF Syntax TextCodec diff --git a/Userland/Libraries/LibProtocol/CMakeLists.txt b/Userland/Libraries/LibRequests/CMakeLists.txt similarity index 69% rename from Userland/Libraries/LibProtocol/CMakeLists.txt rename to Userland/Libraries/LibRequests/CMakeLists.txt index cbf23b0fc1b..2923a5e2851 100644 --- a/Userland/Libraries/LibProtocol/CMakeLists.txt +++ b/Userland/Libraries/LibRequests/CMakeLists.txt @@ -9,5 +9,5 @@ set(GENERATED_SOURCES ../../Services/RequestServer/RequestServerEndpoint.h ) -serenity_lib(LibProtocol protocol) -target_link_libraries(LibProtocol PRIVATE LibCore LibIPC) +serenity_lib(LibRequests requests) +target_link_libraries(LibRequests PRIVATE LibCore LibIPC) diff --git a/Userland/Libraries/LibProtocol/Request.cpp b/Userland/Libraries/LibRequests/Request.cpp similarity index 97% rename from Userland/Libraries/LibProtocol/Request.cpp rename to Userland/Libraries/LibRequests/Request.cpp index 06b6c305cec..545dd83b806 100644 --- a/Userland/Libraries/LibProtocol/Request.cpp +++ b/Userland/Libraries/LibRequests/Request.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include +#include -namespace Protocol { +namespace Requests { Request::Request(RequestClient& client, i32 request_id) : m_client(client) @@ -29,7 +29,7 @@ bool Request::stop() return m_client->stop_request({}, *this); } -void Request::set_request_fd(Badge, int fd) +void Request::set_request_fd(Badge, int fd) { VERIFY(m_fd == -1); m_fd = fd; diff --git a/Userland/Libraries/LibProtocol/Request.h b/Userland/Libraries/LibRequests/Request.h similarity index 99% rename from Userland/Libraries/LibProtocol/Request.h rename to Userland/Libraries/LibRequests/Request.h index 7376f880c95..3b302903d3e 100644 --- a/Userland/Libraries/LibProtocol/Request.h +++ b/Userland/Libraries/LibRequests/Request.h @@ -17,7 +17,7 @@ #include #include -namespace Protocol { +namespace Requests { class RequestClient; diff --git a/Userland/Libraries/LibProtocol/RequestClient.cpp b/Userland/Libraries/LibRequests/RequestClient.cpp similarity index 98% rename from Userland/Libraries/LibProtocol/RequestClient.cpp rename to Userland/Libraries/LibRequests/RequestClient.cpp index 3b1f89f81dc..22f73d51556 100644 --- a/Userland/Libraries/LibProtocol/RequestClient.cpp +++ b/Userland/Libraries/LibRequests/RequestClient.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include +#include -namespace Protocol { +namespace Requests { RequestClient::RequestClient(NonnullOwnPtr socket) : IPC::ConnectionToServer(*this, move(socket)) diff --git a/Userland/Libraries/LibProtocol/RequestClient.h b/Userland/Libraries/LibRequests/RequestClient.h similarity index 97% rename from Userland/Libraries/LibProtocol/RequestClient.h rename to Userland/Libraries/LibRequests/RequestClient.h index 25eec7b324b..8827f203685 100644 --- a/Userland/Libraries/LibProtocol/RequestClient.h +++ b/Userland/Libraries/LibRequests/RequestClient.h @@ -9,12 +9,12 @@ #include #include #include -#include +#include #include #include #include -namespace Protocol { +namespace Requests { class Request; diff --git a/Userland/Libraries/LibProtocol/WebSocket.cpp b/Userland/Libraries/LibRequests/WebSocket.cpp similarity index 95% rename from Userland/Libraries/LibProtocol/WebSocket.cpp rename to Userland/Libraries/LibRequests/WebSocket.cpp index 2dd2d56c234..8d51b38b286 100644 --- a/Userland/Libraries/LibProtocol/WebSocket.cpp +++ b/Userland/Libraries/LibRequests/WebSocket.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include +#include -namespace Protocol { +namespace Requests { WebSocket::WebSocket(RequestClient& client, i32 connection_id) : m_client(client) diff --git a/Userland/Libraries/LibProtocol/WebSocket.h b/Userland/Libraries/LibRequests/WebSocket.h similarity index 98% rename from Userland/Libraries/LibProtocol/WebSocket.h rename to Userland/Libraries/LibRequests/WebSocket.h index ef7b9212ff8..b6e8691df26 100644 --- a/Userland/Libraries/LibProtocol/WebSocket.h +++ b/Userland/Libraries/LibRequests/WebSocket.h @@ -15,7 +15,7 @@ #include #include -namespace Protocol { +namespace Requests { class RequestClient; diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 8427ee3846b..f7f6d8561c5 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -773,7 +773,7 @@ set(GENERATED_SOURCES serenity_lib(LibWeb web) -target_link_libraries(LibWeb PRIVATE LibCore LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibAudio LibMedia LibWasm LibXML LibIDL LibURL LibTLS ${SKIA_LIBRARIES}) +target_link_libraries(LibWeb PRIVATE LibCore LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibAudio LibMedia LibWasm LibXML LibIDL LibURL LibTLS LibRequests ${SKIA_LIBRARIES}) generate_js_bindings(LibWeb) diff --git a/Userland/Libraries/LibWeb/Loader/ResourceLoader.h b/Userland/Libraries/LibWeb/Loader/ResourceLoader.h index d02813f3a11..21063ccca73 100644 --- a/Userland/Libraries/LibWeb/Loader/ResourceLoader.h +++ b/Userland/Libraries/LibWeb/Loader/ResourceLoader.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,11 +36,11 @@ public: // Configure the request such that the entirety of the response data is buffered. The callback receives that data and // the response headers all at once. Using this method is mutually exclusive with `set_unbuffered_data_received_callback`. - virtual void set_buffered_request_finished_callback(Protocol::Request::BufferedRequestFinished) = 0; + virtual void set_buffered_request_finished_callback(Requests::Request::BufferedRequestFinished) = 0; // Configure the request such that the response data is provided unbuffered as it is received. Using this method is // mutually exclusive with `set_buffered_request_finished_callback`. - virtual void set_unbuffered_request_callbacks(Protocol::Request::HeadersReceived, Protocol::Request::DataReceived, Protocol::Request::RequestFinished) = 0; + virtual void set_unbuffered_request_callbacks(Requests::Request::HeadersReceived, Requests::Request::DataReceived, Requests::Request::RequestFinished) = 0; virtual bool stop() = 0; diff --git a/Userland/Libraries/LibWebView/CMakeLists.txt b/Userland/Libraries/LibWebView/CMakeLists.txt index 82c3b36c42b..f0ffbe30f0b 100644 --- a/Userland/Libraries/LibWebView/CMakeLists.txt +++ b/Userland/Libraries/LibWebView/CMakeLists.txt @@ -48,7 +48,7 @@ set(GENERATED_SOURCES ) serenity_lib(LibWebView webview) -target_link_libraries(LibWebView PRIVATE LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibProtocol LibJS LibWeb LibUnicode LibURL) +target_link_libraries(LibWebView PRIVATE LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibRequests LibJS LibWeb LibUnicode LibURL) target_compile_definitions(LibWebView PRIVATE ENABLE_PUBLIC_SUFFIX=$) # Third-party diff --git a/Userland/Libraries/LibWebView/RequestServerAdapter.cpp b/Userland/Libraries/LibWebView/RequestServerAdapter.cpp index 72c8864bd6e..a0a15afde55 100644 --- a/Userland/Libraries/LibWebView/RequestServerAdapter.cpp +++ b/Userland/Libraries/LibWebView/RequestServerAdapter.cpp @@ -5,18 +5,18 @@ */ #include "WebSocketClientAdapter.h" -#include -#include +#include +#include #include namespace WebView { -ErrorOr> RequestServerRequestAdapter::try_create(NonnullRefPtr request) +ErrorOr> RequestServerRequestAdapter::try_create(NonnullRefPtr request) { return adopt_nonnull_ref_or_enomem(new (nothrow) RequestServerRequestAdapter(move(request))); } -RequestServerRequestAdapter::RequestServerRequestAdapter(NonnullRefPtr request) +RequestServerRequestAdapter::RequestServerRequestAdapter(NonnullRefPtr request) : m_request(request) { request->on_progress = [weak_this = make_weak_ptr()](Optional total_size, u64 downloaded_size) { @@ -29,25 +29,25 @@ RequestServerRequestAdapter::RequestServerRequestAdapter(NonnullRefPtron_certificate_requested) { auto certificate_and_key = strong_this->on_certificate_requested(); - return Protocol::Request::CertificateAndKey { + return Requests::Request::CertificateAndKey { .certificate = move(certificate_and_key.certificate), .key = move(certificate_and_key.key), }; } } - return Protocol::Request::CertificateAndKey {}; + return Requests::Request::CertificateAndKey {}; }; } RequestServerRequestAdapter::~RequestServerRequestAdapter() = default; -void RequestServerRequestAdapter::set_buffered_request_finished_callback(Protocol::Request::BufferedRequestFinished on_buffered_request_finished) +void RequestServerRequestAdapter::set_buffered_request_finished_callback(Requests::Request::BufferedRequestFinished on_buffered_request_finished) { m_request->set_buffered_request_finished_callback(move(on_buffered_request_finished)); } -void RequestServerRequestAdapter::set_unbuffered_request_callbacks(Protocol::Request::HeadersReceived on_headers_received, Protocol::Request::DataReceived on_data_received, Protocol::Request::RequestFinished on_finished) +void RequestServerRequestAdapter::set_unbuffered_request_callbacks(Requests::Request::HeadersReceived on_headers_received, Requests::Request::DataReceived on_data_received, Requests::Request::RequestFinished on_finished) { m_request->set_unbuffered_request_callbacks(move(on_headers_received), move(on_data_received), move(on_finished)); } @@ -57,18 +57,18 @@ bool RequestServerRequestAdapter::stop() return m_request->stop(); } -ErrorOr> RequestServerAdapter::try_create(NonnullRefPtr protocol_client) +ErrorOr> RequestServerAdapter::try_create(NonnullRefPtr protocol_client) { return try_make_ref_counted(move(protocol_client)); } ErrorOr> RequestServerAdapter::try_create() { - auto protocol_client = TRY(Protocol::RequestClient::try_create()); + auto protocol_client = TRY(Requests::RequestClient::try_create()); return try_make_ref_counted(move(protocol_client)); } -RequestServerAdapter::RequestServerAdapter(NonnullRefPtr protocol_client) +RequestServerAdapter::RequestServerAdapter(NonnullRefPtr protocol_client) : m_protocol_client(protocol_client) { } diff --git a/Userland/Libraries/LibWebView/RequestServerAdapter.h b/Userland/Libraries/LibWebView/RequestServerAdapter.h index 2a50c7aa5ef..9170de1c35c 100644 --- a/Userland/Libraries/LibWebView/RequestServerAdapter.h +++ b/Userland/Libraries/LibWebView/RequestServerAdapter.h @@ -11,7 +11,7 @@ #include #include -namespace Protocol { +namespace Requests { class Request; class RequestClient; } @@ -22,23 +22,23 @@ class RequestServerRequestAdapter : public Web::ResourceLoaderConnectorRequest , public Weakable { public: - static ErrorOr> try_create(NonnullRefPtr); + static ErrorOr> try_create(NonnullRefPtr); virtual ~RequestServerRequestAdapter() override; - virtual void set_buffered_request_finished_callback(Protocol::Request::BufferedRequestFinished) override; - virtual void set_unbuffered_request_callbacks(Protocol::Request::HeadersReceived, Protocol::Request::DataReceived, Protocol::Request::RequestFinished) override; + virtual void set_buffered_request_finished_callback(Requests::Request::BufferedRequestFinished) override; + virtual void set_unbuffered_request_callbacks(Requests::Request::HeadersReceived, Requests::Request::DataReceived, Requests::Request::RequestFinished) override; virtual bool stop() override; private: - RequestServerRequestAdapter(NonnullRefPtr); - NonnullRefPtr m_request; + RequestServerRequestAdapter(NonnullRefPtr); + NonnullRefPtr m_request; }; class RequestServerAdapter : public Web::ResourceLoaderConnector { public: - explicit RequestServerAdapter(NonnullRefPtr protocol_client); + explicit RequestServerAdapter(NonnullRefPtr protocol_client); - static ErrorOr> try_create(NonnullRefPtr); + static ErrorOr> try_create(NonnullRefPtr); static ErrorOr> try_create(); virtual ~RequestServerAdapter() override; @@ -49,7 +49,7 @@ public: virtual RefPtr websocket_connect(const URL::URL&, ByteString const& origin, Vector const& protocols) override; private: - RefPtr m_protocol_client; + RefPtr m_protocol_client; }; } diff --git a/Userland/Libraries/LibWebView/WebSocketClientAdapter.cpp b/Userland/Libraries/LibWebView/WebSocketClientAdapter.cpp index 6eaf2463e7c..2a4d355b9ec 100644 --- a/Userland/Libraries/LibWebView/WebSocketClientAdapter.cpp +++ b/Userland/Libraries/LibWebView/WebSocketClientAdapter.cpp @@ -4,18 +4,18 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include +#include #include namespace WebView { -RefPtr WebSocketClientSocketAdapter::create(NonnullRefPtr websocket) +RefPtr WebSocketClientSocketAdapter::create(NonnullRefPtr websocket) { return adopt_ref(*new WebSocketClientSocketAdapter(move(websocket))); } -WebSocketClientSocketAdapter::WebSocketClientSocketAdapter(NonnullRefPtr websocket) +WebSocketClientSocketAdapter::WebSocketClientSocketAdapter(NonnullRefPtr websocket) : m_websocket(move(websocket)) { m_websocket->on_open = [weak_this = make_weak_ptr()] { @@ -37,13 +37,13 @@ WebSocketClientSocketAdapter::WebSocketClientSocketAdapter(NonnullRefPtron_error) { switch (error) { - case Protocol::WebSocket::Error::CouldNotEstablishConnection: + case Requests::WebSocket::Error::CouldNotEstablishConnection: strong_this->on_error(Web::WebSockets::WebSocketClientSocket::Error::CouldNotEstablishConnection); return; - case Protocol::WebSocket::Error::ConnectionUpgradeFailed: + case Requests::WebSocket::Error::ConnectionUpgradeFailed: strong_this->on_error(Web::WebSockets::WebSocketClientSocket::Error::ConnectionUpgradeFailed); return; - case Protocol::WebSocket::Error::ServerClosedSocket: + case Requests::WebSocket::Error::ServerClosedSocket: strong_this->on_error(Web::WebSockets::WebSocketClientSocket::Error::ServerClosedSocket); return; } @@ -60,13 +60,13 @@ WebSocketClientSocketAdapter::WebSocketClientSocketAdapter(NonnullRefPtron_certificate_requested) { auto certificate_and_key = weak_this->on_certificate_requested(); - return Protocol::WebSocket::CertificateAndKey { + return Requests::WebSocket::CertificateAndKey { .certificate = move(certificate_and_key.certificate), .key = move(certificate_and_key.key), }; } } - return Protocol::WebSocket::CertificateAndKey {}; + return Requests::WebSocket::CertificateAndKey {}; }; } @@ -75,13 +75,13 @@ WebSocketClientSocketAdapter::~WebSocketClientSocketAdapter() = default; Web::WebSockets::WebSocket::ReadyState WebSocketClientSocketAdapter::ready_state() { switch (m_websocket->ready_state()) { - case Protocol::WebSocket::ReadyState::Connecting: + case Requests::WebSocket::ReadyState::Connecting: return Web::WebSockets::WebSocket::ReadyState::Connecting; - case Protocol::WebSocket::ReadyState::Open: + case Requests::WebSocket::ReadyState::Open: return Web::WebSockets::WebSocket::ReadyState::Open; - case Protocol::WebSocket::ReadyState::Closing: + case Requests::WebSocket::ReadyState::Closing: return Web::WebSockets::WebSocket::ReadyState::Closing; - case Protocol::WebSocket::ReadyState::Closed: + case Requests::WebSocket::ReadyState::Closed: return Web::WebSockets::WebSocket::ReadyState::Closed; } VERIFY_NOT_REACHED(); diff --git a/Userland/Libraries/LibWebView/WebSocketClientAdapter.h b/Userland/Libraries/LibWebView/WebSocketClientAdapter.h index d37da678706..aa2b56f9a63 100644 --- a/Userland/Libraries/LibWebView/WebSocketClientAdapter.h +++ b/Userland/Libraries/LibWebView/WebSocketClientAdapter.h @@ -11,7 +11,7 @@ #include #include -namespace Protocol { +namespace Requests { class WebSocket; class RequestClient; }; @@ -22,7 +22,7 @@ class WebSocketClientSocketAdapter : public Web::WebSockets::WebSocketClientSocket , public Weakable { public: - static RefPtr create(NonnullRefPtr); + static RefPtr create(NonnullRefPtr); virtual ~WebSocketClientSocketAdapter() override; virtual Web::WebSockets::WebSocket::ReadyState ready_state() override; @@ -33,9 +33,9 @@ public: virtual void close(u16 code = 1005, ByteString reason = {}) override; private: - WebSocketClientSocketAdapter(NonnullRefPtr); + WebSocketClientSocketAdapter(NonnullRefPtr); - NonnullRefPtr m_websocket; + NonnullRefPtr m_websocket; }; } diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index b236c2518c4..5f4aa7605c7 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,7 +65,7 @@ class HeadlessWebContentView final : public WebView::ViewImplementation { public: static ErrorOr> create(Core::AnonymousBuffer theme, Gfx::IntSize const& window_size, StringView resources_folder) { - RefPtr request_client; + RefPtr request_client; RefPtr image_decoder_client; auto request_server_paths = TRY(get_paths_for_helper_process("RequestServer"sv)); @@ -145,7 +145,7 @@ public: } private: - HeadlessWebContentView(NonnullRefPtr database, NonnullOwnPtr cookie_jar, RefPtr image_decoder_client, RefPtr request_client) + HeadlessWebContentView(NonnullRefPtr database, NonnullOwnPtr cookie_jar, RefPtr image_decoder_client, RefPtr request_client) : m_database(move(database)) , m_cookie_jar(move(cookie_jar)) , m_request_client(move(request_client)) @@ -178,7 +178,7 @@ private: NonnullRefPtr m_database; NonnullOwnPtr m_cookie_jar; - RefPtr m_request_client; + RefPtr m_request_client; RefPtr m_image_decoder_client; };