diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index d4970d6edb1..b169662a03c 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -258,7 +258,6 @@ set(SOURCES Fetch/FetchMethod.cpp Fetch/Headers.cpp Fetch/HeadersIterator.cpp - Fetch/Infrastructure/ConnectionTimingInfo.cpp Fetch/Infrastructure/FetchAlgorithms.cpp Fetch/Infrastructure/FetchController.cpp Fetch/Infrastructure/FetchRecord.cpp diff --git a/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.cpp b/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.cpp deleted file mode 100644 index eaa97c1df3f..00000000000 --- a/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2022, Linus Groh - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include - -namespace Web::Fetch::Infrastructure { - -GC_DEFINE_ALLOCATOR(ConnectionTimingInfo); - -ConnectionTimingInfo::ConnectionTimingInfo() = default; - -GC::Ref ConnectionTimingInfo::create(JS::VM& vm) -{ - return vm.heap().allocate(); -} - -} diff --git a/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.h b/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.h index 3f61f76c693..262bc01eb9f 100644 --- a/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.h +++ b/Libraries/LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2022, Linus Groh + * Copyright (c) 2025, Andrew Kaster * * SPDX-License-Identifier: BSD-2-Clause */ @@ -7,70 +8,41 @@ #pragma once #include -#include -#include #include namespace Web::Fetch::Infrastructure { // https://fetch.spec.whatwg.org/#connection-timing-info -class ConnectionTimingInfo : public JS::Cell { - GC_CELL(ConnectionTimingInfo, JS::Cell); - GC_DECLARE_ALLOCATOR(ConnectionTimingInfo); - -public: - [[nodiscard]] static GC::Ref create(JS::VM&); - - [[nodiscard]] HighResolutionTime::DOMHighResTimeStamp domain_lookup_start_time() const { return m_domain_lookup_start_time; } - void set_domain_lookup_start_time(HighResolutionTime::DOMHighResTimeStamp domain_lookup_start_time) { m_domain_lookup_start_time = domain_lookup_start_time; } - - [[nodiscard]] HighResolutionTime::DOMHighResTimeStamp domain_lookup_end_time() const { return m_domain_lookup_end_time; } - void set_domain_lookup_end_time(HighResolutionTime::DOMHighResTimeStamp domain_lookup_end_time) { m_domain_lookup_end_time = domain_lookup_end_time; } - - [[nodiscard]] HighResolutionTime::DOMHighResTimeStamp connection_start_time() const { return m_connection_start_time; } - void set_connection_start_time(HighResolutionTime::DOMHighResTimeStamp connection_start_time) { m_connection_start_time = connection_start_time; } - - [[nodiscard]] HighResolutionTime::DOMHighResTimeStamp connection_end_time() const { return m_connection_end_time; } - void set_connection_end_time(HighResolutionTime::DOMHighResTimeStamp connection_end_time) { m_connection_end_time = connection_end_time; } - - [[nodiscard]] HighResolutionTime::DOMHighResTimeStamp secure_connection_start_time() const { return m_secure_connection_start_time; } - void set_secure_connection_start_time(HighResolutionTime::DOMHighResTimeStamp secure_connection_start_time) { m_secure_connection_start_time = secure_connection_start_time; } - - [[nodiscard]] ReadonlyBytes lpn_negotiated_protocol() const { return m_lpn_negotiated_protocol; } - void set_lpn_negotiated_protocol(ByteBuffer lpn_negotiated_protocol) { m_lpn_negotiated_protocol = move(lpn_negotiated_protocol); } - -private: - ConnectionTimingInfo(); - +struct ConnectionTimingInfo { // https://fetch.spec.whatwg.org/#connection-timing-info-domain-lookup-start-time // domain lookup start time (default 0) // A DOMHighResTimeStamp. - HighResolutionTime::DOMHighResTimeStamp m_domain_lookup_start_time { 0 }; + HighResolutionTime::DOMHighResTimeStamp domain_lookup_start_time { 0 }; // https://fetch.spec.whatwg.org/#connection-timing-info-domain-lookup-end-time // domain lookup end time (default 0) // A DOMHighResTimeStamp. - HighResolutionTime::DOMHighResTimeStamp m_domain_lookup_end_time { 0 }; + HighResolutionTime::DOMHighResTimeStamp domain_lookup_end_time { 0 }; // https://fetch.spec.whatwg.org/#connection-timing-info-connection-start-time // connection start time (default 0) // A DOMHighResTimeStamp. - HighResolutionTime::DOMHighResTimeStamp m_connection_start_time { 0 }; + HighResolutionTime::DOMHighResTimeStamp connection_start_time { 0 }; // https://fetch.spec.whatwg.org/#connection-timing-info-connection-end-time // connection end time (default 0) // A DOMHighResTimeStamp. - HighResolutionTime::DOMHighResTimeStamp m_connection_end_time { 0 }; + HighResolutionTime::DOMHighResTimeStamp connection_end_time { 0 }; // https://fetch.spec.whatwg.org/#connection-timing-info-secure-connection-start-time // secure connection start time (default 0) // A DOMHighResTimeStamp. - HighResolutionTime::DOMHighResTimeStamp m_secure_connection_start_time { 0 }; + HighResolutionTime::DOMHighResTimeStamp secure_connection_start_time { 0 }; // https://fetch.spec.whatwg.org/#connection-timing-info-alpn-negotiated-protocol // ALPN negotiated protocol (default the empty byte sequence) // A byte sequence. - ByteBuffer m_lpn_negotiated_protocol; + ByteBuffer alpn_negotiated_protocol; }; } diff --git a/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.cpp b/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.cpp index 2e54d5dea45..8f27867547e 100644 --- a/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.cpp +++ b/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.cpp @@ -22,7 +22,6 @@ GC::Ref FetchTimingInfo::create(JS::VM& vm) void FetchTimingInfo::visit_edges(JS::Cell::Visitor& visitor) { Base::visit_edges(visitor); - visitor.visit(m_final_connection_timing_info); } // https://fetch.spec.whatwg.org/#create-an-opaque-timing-info diff --git a/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.h b/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.h index a41c5a9a161..84e66777c2c 100644 --- a/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.h +++ b/Libraries/LibWeb/Fetch/Infrastructure/FetchTimingInfo.h @@ -48,8 +48,8 @@ public: [[nodiscard]] HighResolutionTime::DOMHighResTimeStamp end_time() const { return m_end_time; } void set_end_time(HighResolutionTime::DOMHighResTimeStamp end_time) { m_end_time = end_time; } - [[nodiscard]] GC::Ptr final_connection_timing_info() const { return m_final_connection_timing_info; } - void set_final_connection_timing_info(GC::Ptr final_connection_timing_info) { m_final_connection_timing_info = final_connection_timing_info; } + [[nodiscard]] Optional const& final_connection_timing_info() const { return m_final_connection_timing_info; } + void set_final_connection_timing_info(ConnectionTimingInfo final_connection_timing_info) { m_final_connection_timing_info = move(final_connection_timing_info); } [[nodiscard]] Vector& server_timing_headers() { return m_server_timing_headers; } [[nodiscard]] Vector const& server_timing_headers() const { return m_server_timing_headers; } @@ -106,7 +106,7 @@ private: // https://fetch.spec.whatwg.org/#fetch-timing-info-final-connection-timing-info // final connection timing info (default null) // Null or a connection timing info. - GC::Ptr m_final_connection_timing_info; + Optional m_final_connection_timing_info; // https://fetch.spec.whatwg.org/#fetch-timing-info-server-timing-headers // server-timing headers (default « ») diff --git a/Libraries/LibWeb/Forward.h b/Libraries/LibWeb/Forward.h index 923a7926cc0..4756c21eaee 100644 --- a/Libraries/LibWeb/Forward.h +++ b/Libraries/LibWeb/Forward.h @@ -363,7 +363,6 @@ class RefCountedFlag; namespace Web::Fetch::Infrastructure { class Body; -class ConnectionTimingInfo; class FetchAlgorithms; class FetchController; class FetchParams; @@ -375,6 +374,7 @@ class Request; class Response; struct BodyWithType; +struct ConnectionTimingInfo; struct Header; }