LibWeb: Make HeaderList ref-counted

This is needed to eventually share a header list between a Request or
Response object's internal infra request/response and the object's
exposed Header object.

Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Headers.h

@@ -26,7 +26,9 @@ struct Header {
 
 // https://fetch.spec.whatwg.org/#concept-header-list
 // A header list is a list of zero or more headers. It is initially the empty list.
-class HeaderList final : Vector<Header> {
+class HeaderList final
+    : public RefCounted<HeaderList>
+    , Vector<Header> {
 public:
     using Vector::begin;
     using Vector::end;

Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Requests.cpp

@@ -9,6 +9,11 @@
 
 namespace Web::Fetch::Infrastructure {
 
+Request::Request()
+    : m_header_list(make_ref_counted<HeaderList>())
+{
+}
+
 // https://fetch.spec.whatwg.org/#concept-request-url
 AK::URL const& Request::url() const
 {
@@ -202,7 +207,7 @@ ErrorOr<void> Request::add_range_reader(u64 first, Optional<u64> const& last)
         .name = TRY(ByteBuffer::copy("Range"sv.bytes())),
         .value = move(range_value),
     };
-    TRY(m_header_list.append(move(header)));
+    TRY(m_header_list->append(move(header)));
 
     return {};
 }

Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Requests.h

@@ -154,7 +154,7 @@ public:
     using ReservedClientType = Variant<Empty, HTML::Environment*, HTML::EnvironmentSettingsObject*>;
     using WindowType = Variant<Window, HTML::EnvironmentSettingsObject*>;
 
-    Request() = default;
+    Request();
 
     [[nodiscard]] ReadonlyBytes method() const { return m_method; }
     void set_method(ByteBuffer method) { m_method = move(method); }
@@ -162,9 +162,9 @@ public:
     [[nodiscard]] bool local_urls_only() const { return m_local_urls_only; }
     void set_local_urls_only(bool local_urls_only) { m_local_urls_only = local_urls_only; }
 
-    [[nodiscard]] HeaderList const& header_list() const { return m_header_list; }
-    [[nodiscard]] HeaderList& header_list() { return m_header_list; }
-    void set_header_list(HeaderList header_list) { m_header_list = move(header_list); }
+    [[nodiscard]] NonnullRefPtr<HeaderList> const& header_list() const { return m_header_list; }
+    [[nodiscard]] NonnullRefPtr<HeaderList>& header_list() { return m_header_list; }
+    void set_header_list(NonnullRefPtr<HeaderList> header_list) { m_header_list = move(header_list); }
 
     [[nodiscard]] bool unsafe_request() const { return m_unsafe_request; }
     void set_unsafe_request(bool unsafe_request) { m_unsafe_request = unsafe_request; }
@@ -304,7 +304,7 @@ private:
 
     // https://fetch.spec.whatwg.org/#concept-request-header-list
     // A request has an associated header list (a header list). Unless stated otherwise it is empty.
-    HeaderList m_header_list;
+    NonnullRefPtr<HeaderList> m_header_list;
 
     // https://fetch.spec.whatwg.org/#unsafe-request-flag
     // A request has an associated unsafe-request flag. Unless stated otherwise it is unset.

Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Responses.cpp

@@ -9,6 +9,11 @@
 
 namespace Web::Fetch::Infrastructure {
 
+Response::Response()
+    : m_header_list(make_ref_counted<HeaderList>())
+{
+}
+
 // https://fetch.spec.whatwg.org/#ref-for-concept-network-error%E2%91%A3
 // A network error is a response whose status is always 0, status message is always
 // the empty byte sequence, header list is always empty, and body is always null.
@@ -111,16 +116,16 @@ ErrorOr<NonnullOwnPtr<BasicFilteredResponse>> BasicFilteredResponse::create(Resp
 {
     // A basic filtered response is a filtered response whose type is "basic" and header list excludes
     // any headers in internal response’s header list whose name is a forbidden response-header name.
-    HeaderList header_list;
-    for (auto const& header : internal_response.header_list()) {
+    auto header_list = make_ref_counted<HeaderList>();
+    for (auto const& header : *internal_response.header_list()) {
         if (!is_forbidden_response_header_name(header.name))
-            TRY(header_list.append(header));
+            TRY(header_list->append(header));
     }
 
     return adopt_own(*new BasicFilteredResponse(internal_response, move(header_list)));
 }
 
-BasicFilteredResponse::BasicFilteredResponse(Response& internal_response, HeaderList header_list)
+BasicFilteredResponse::BasicFilteredResponse(Response& internal_response, NonnullRefPtr<HeaderList> header_list)
     : FilteredResponse(internal_response)
     , m_header_list(move(header_list))
 {
@@ -135,16 +140,16 @@ ErrorOr<NonnullOwnPtr<CORSFilteredResponse>> CORSFilteredResponse::create(Respon
     for (auto const& header_name : internal_response.cors_exposed_header_name_list())
         cors_exposed_header_name_list.append(header_name.span());
 
-    HeaderList header_list;
-    for (auto const& header : internal_response.header_list()) {
+    auto header_list = make_ref_counted<HeaderList>();
+    for (auto const& header : *internal_response.header_list()) {
         if (is_cors_safelisted_response_header_name(header.name, cors_exposed_header_name_list))
-            TRY(header_list.append(header));
+            TRY(header_list->append(header));
     }
 
     return adopt_own(*new CORSFilteredResponse(internal_response, move(header_list)));
 }
 
-CORSFilteredResponse::CORSFilteredResponse(Response& internal_response, HeaderList header_list)
+CORSFilteredResponse::CORSFilteredResponse(Response& internal_response, NonnullRefPtr<HeaderList> header_list)
     : FilteredResponse(internal_response)
     , m_header_list(move(header_list))
 {
@@ -159,6 +164,7 @@ NonnullOwnPtr<OpaqueFilteredResponse> OpaqueFilteredResponse::create(Response& i
 
 OpaqueFilteredResponse::OpaqueFilteredResponse(Response& internal_response)
     : FilteredResponse(internal_response)
+    , m_header_list(make_ref_counted<HeaderList>())
 {
 }
 
@@ -169,6 +175,7 @@ NonnullOwnPtr<OpaqueRedirectFilteredResponse> OpaqueRedirectFilteredResponse::cr
 
 OpaqueRedirectFilteredResponse::OpaqueRedirectFilteredResponse(Response& internal_response)
     : FilteredResponse(internal_response)
+    , m_header_list(make_ref_counted<HeaderList>())
 {
 }
 

Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Responses.h

@@ -47,7 +47,7 @@ public:
     [[nodiscard]] static NonnullOwnPtr<Response> aborted_network_error();
     [[nodiscard]] static NonnullOwnPtr<Response> network_error();
 
-    Response() = default;
+    Response();
     virtual ~Response() = default;
 
     [[nodiscard]] virtual Type type() const { return m_type; }
@@ -66,9 +66,9 @@ public:
     [[nodiscard]] virtual ReadonlyBytes status_message() const { return m_status_message; }
     void set_status_message(ByteBuffer status_message) { m_status_message = move(status_message); }
 
-    [[nodiscard]] virtual HeaderList const& header_list() const { return m_header_list; }
-    [[nodiscard]] HeaderList& header_list() { return m_header_list; }
-    void set_header_list(HeaderList header_list) { m_header_list = move(header_list); }
+    [[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const { return m_header_list; }
+    [[nodiscard]] NonnullRefPtr<HeaderList>& header_list() { return m_header_list; }
+    void set_header_list(NonnullRefPtr<HeaderList> header_list) { m_header_list = move(header_list); }
 
     [[nodiscard]] virtual Optional<Body> const& body() const { return m_body; }
     [[nodiscard]] Optional<Body>& body() { return m_body; }
@@ -124,7 +124,7 @@ private:
 
     // https://fetch.spec.whatwg.org/#concept-response-header-list
     // A response has an associated header list (a header list). Unless stated otherwise it is empty.
-    HeaderList m_header_list;
+    NonnullRefPtr<HeaderList> m_header_list;
 
     // https://fetch.spec.whatwg.org/#concept-response-body
     // A response has an associated body (null or a body). Unless stated otherwise it is null.
@@ -169,7 +169,7 @@ public:
     [[nodiscard]] virtual Vector<AK::URL> const& url_list() const override { return m_internal_response.url_list(); }
     [[nodiscard]] virtual Status status() const override { return m_internal_response.status(); }
     [[nodiscard]] virtual ReadonlyBytes status_message() const override { return m_internal_response.status_message(); }
-    [[nodiscard]] virtual HeaderList const& header_list() const override { return m_internal_response.header_list(); }
+    [[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_internal_response.header_list(); }
     [[nodiscard]] virtual Optional<Body> const& body() const override { return m_internal_response.body(); }
     [[nodiscard]] virtual Optional<CacheState> const& cache_state() const override { return m_internal_response.cache_state(); }
     [[nodiscard]] virtual Vector<ByteBuffer> const& cors_exposed_header_name_list() const override { return m_internal_response.cors_exposed_header_name_list(); }
@@ -192,12 +192,12 @@ public:
     static ErrorOr<NonnullOwnPtr<BasicFilteredResponse>> create(Response&);
 
     [[nodiscard]] virtual Type type() const override { return Type::Basic; }
-    [[nodiscard]] virtual HeaderList const& header_list() const override { return m_header_list; }
+    [[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
 
 private:
-    BasicFilteredResponse(Response&, HeaderList);
+    BasicFilteredResponse(Response&, NonnullRefPtr<HeaderList>);
 
-    HeaderList m_header_list;
+    NonnullRefPtr<HeaderList> m_header_list;
 };
 
 // https://fetch.spec.whatwg.org/#concept-filtered-response-cors
@@ -206,12 +206,12 @@ public:
     static ErrorOr<NonnullOwnPtr<CORSFilteredResponse>> create(Response&);
 
     [[nodiscard]] virtual Type type() const override { return Type::CORS; }
-    [[nodiscard]] virtual HeaderList const& header_list() const override { return m_header_list; }
+    [[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
 
 private:
-    CORSFilteredResponse(Response&, HeaderList);
+    CORSFilteredResponse(Response&, NonnullRefPtr<HeaderList>);
 
-    HeaderList m_header_list;
+    NonnullRefPtr<HeaderList> m_header_list;
 };
 
 // https://fetch.spec.whatwg.org/#concept-filtered-response-opaque
@@ -223,14 +223,14 @@ public:
     [[nodiscard]] virtual Vector<AK::URL> const& url_list() const override { return m_url_list; }
     [[nodiscard]] virtual Status status() const override { return 0; }
     [[nodiscard]] virtual ReadonlyBytes status_message() const override { return {}; }
-    [[nodiscard]] virtual HeaderList const& header_list() const override { return m_header_list; }
+    [[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
     [[nodiscard]] virtual Optional<Body> const& body() const override { return m_body; }
 
 private:
     explicit OpaqueFilteredResponse(Response&);
 
     Vector<AK::URL> m_url_list;
-    HeaderList m_header_list;
+    NonnullRefPtr<HeaderList> m_header_list;
     Optional<Body> m_body;
 };
 
@@ -242,13 +242,13 @@ public:
     [[nodiscard]] virtual Type type() const override { return Type::OpaqueRedirect; }
     [[nodiscard]] virtual Status status() const override { return 0; }
     [[nodiscard]] virtual ReadonlyBytes status_message() const override { return {}; }
-    [[nodiscard]] virtual HeaderList const& header_list() const override { return m_header_list; }
+    [[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
     [[nodiscard]] virtual Optional<Body> const& body() const override { return m_body; }
 
 private:
     explicit OpaqueRedirectFilteredResponse(Response&);
 
-    HeaderList m_header_list;
+    NonnullRefPtr<HeaderList> m_header_list;
     Optional<Body> m_body;
 };