LibWeb: Convert ConnectionTimingInfo to a standard layout struct

There's nothing about this type that requires it to be GC allocated
This commit is contained in:
Andrew Kaster 2025-01-23 09:15:35 -07:00 committed by Andrew Kaster
parent 47716a4e11
commit 8e3798b25e
Notes: github-actions[bot] 2025-02-18 18:36:45 +00:00
6 changed files with 12 additions and 64 deletions

View file

@ -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

View file

@ -1,22 +0,0 @@
/*
* Copyright (c) 2022, Linus Groh <linusg@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibGC/Heap.h>
#include <LibJS/Runtime/VM.h>
#include <LibWeb/Fetch/Infrastructure/ConnectionTimingInfo.h>
namespace Web::Fetch::Infrastructure {
GC_DEFINE_ALLOCATOR(ConnectionTimingInfo);
ConnectionTimingInfo::ConnectionTimingInfo() = default;
GC::Ref<ConnectionTimingInfo> ConnectionTimingInfo::create(JS::VM& vm)
{
return vm.heap().allocate<ConnectionTimingInfo>();
}
}

View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, Linus Groh <linusg@serenityos.org>
* Copyright (c) 2025, Andrew Kaster <andrew@ladybird.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -7,70 +8,41 @@
#pragma once
#include <AK/ByteBuffer.h>
#include <LibGC/Ptr.h>
#include <LibJS/Heap/Cell.h>
#include <LibWeb/HighResolutionTime/DOMHighResTimeStamp.h>
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<ConnectionTimingInfo> 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;
};
}

View file

@ -22,7 +22,6 @@ GC::Ref<FetchTimingInfo> 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

View file

@ -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<ConnectionTimingInfo> final_connection_timing_info() const { return m_final_connection_timing_info; }
void set_final_connection_timing_info(GC::Ptr<ConnectionTimingInfo> final_connection_timing_info) { m_final_connection_timing_info = final_connection_timing_info; }
[[nodiscard]] Optional<ConnectionTimingInfo> 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<String>& server_timing_headers() { return m_server_timing_headers; }
[[nodiscard]] Vector<String> 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<ConnectionTimingInfo> m_final_connection_timing_info;
Optional<ConnectionTimingInfo> m_final_connection_timing_info;
// https://fetch.spec.whatwg.org/#fetch-timing-info-server-timing-headers
// server-timing headers (default « »)

View file

@ -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;
}