Skip to content

Commit

Permalink
LibWeb: Also make non-const Response getters virtual
Browse files Browse the repository at this point in the history 
We wouldn't want a filtered response to bypass the overridden methods
based on constness.
  • Loading branch information
@linusg
linusg committed Oct 24, 2022
1 parent 0a186cb commit 8f8fcfe
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Responses.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Response : public RefCounted<Response> {
void set_aborted(bool aborted) { m_aborted = aborted; }

[[nodiscard]] virtual Vector<AK::URL> const& url_list() const { return m_url_list; }
[[nodiscard]] Vector<AK::URL>& url_list() { return m_url_list; }
[[nodiscard]] virtual Vector<AK::URL>& url_list() { return m_url_list; }
void set_url_list(Vector<AK::URL> url_list) { m_url_list = move(url_list); }

[[nodiscard]] virtual Status status() const { return m_status; }
Expand All @@ -68,18 +68,17 @@ class Response : public RefCounted<Response> {
void set_status_message(ByteBuffer status_message) { m_status_message = move(status_message); }

[[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const { return m_header_list; }
[[nodiscard]] NonnullRefPtr<HeaderList>& header_list() { return m_header_list; }
[[nodiscard]] virtual 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; }
[[nodiscard]] virtual Optional<Body>& body() { return m_body; }
void set_body(Optional<Body> body) { m_body = move(body); }

[[nodiscard]] virtual Optional<CacheState> const& cache_state() const { return m_cache_state; }
void set_cache_state(Optional<CacheState> cache_state) { m_cache_state = move(cache_state); }

[[nodiscard]] virtual Vector<ByteBuffer> const& cors_exposed_header_name_list() const { return m_cors_exposed_header_name_list; }
[[nodiscard]] Vector<ByteBuffer>& cors_exposed_header_name_list() { return m_cors_exposed_header_name_list; }
void set_cors_exposed_header_name_list(Vector<ByteBuffer> cors_exposed_header_name_list) { m_cors_exposed_header_name_list = move(cors_exposed_header_name_list); }

[[nodiscard]] virtual bool range_requested() const { return m_range_requested; }
Expand All @@ -92,7 +91,6 @@ class Response : public RefCounted<Response> {
void set_timing_allow_passed(bool timing_allow_passed) { m_timing_allow_passed = timing_allow_passed; }

[[nodiscard]] virtual BodyInfo const& body_info() const { return m_body_info; }
[[nodiscard]] BodyInfo& body_info() { return m_body_info; }
void set_body_info(BodyInfo body_info) { m_body_info = body_info; }

[[nodiscard]] bool is_aborted_network_error() const;
Expand Down Expand Up @@ -172,10 +170,13 @@ class FilteredResponse : public Response {
[[nodiscard]] virtual Type type() const override { return m_internal_response->type(); }
[[nodiscard]] virtual bool aborted() const override { return m_internal_response->aborted(); }
[[nodiscard]] virtual Vector<AK::URL> const& url_list() const override { return m_internal_response->url_list(); }
[[nodiscard]] virtual Vector<AK::URL>& url_list() 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 NonnullRefPtr<HeaderList> const& header_list() const override { return m_internal_response->header_list(); }
[[nodiscard]] virtual NonnullRefPtr<HeaderList>& header_list() override { return m_internal_response->header_list(); }
[[nodiscard]] virtual Optional<Body> const& body() const override { return m_internal_response->body(); }
[[nodiscard]] virtual Optional<Body>& body() 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(); }
[[nodiscard]] virtual bool range_requested() const override { return m_internal_response->range_requested(); }
Expand All @@ -197,6 +198,7 @@ class BasicFilteredResponse final : public FilteredResponse {

[[nodiscard]] virtual Type type() const override { return Type::Basic; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList>& header_list() override { return m_header_list; }

private:
BasicFilteredResponse(NonnullRefPtr<Response>, NonnullRefPtr<HeaderList>);
Expand All @@ -211,6 +213,7 @@ class CORSFilteredResponse final : public FilteredResponse {

[[nodiscard]] virtual Type type() const override { return Type::CORS; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList>& header_list() override { return m_header_list; }

private:
CORSFilteredResponse(NonnullRefPtr<Response>, NonnullRefPtr<HeaderList>);
Expand All @@ -225,10 +228,13 @@ class OpaqueFilteredResponse final : public FilteredResponse {

[[nodiscard]] virtual Type type() const override { return Type::Opaque; }
[[nodiscard]] virtual Vector<AK::URL> const& url_list() const override { return m_url_list; }
[[nodiscard]] virtual Vector<AK::URL>& url_list() override { return m_url_list; }
[[nodiscard]] virtual Status status() const override { return 0; }
[[nodiscard]] virtual ReadonlyBytes status_message() const override { return {}; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList>& header_list() override { return m_header_list; }
[[nodiscard]] virtual Optional<Body> const& body() const override { return m_body; }
[[nodiscard]] virtual Optional<Body>& body() override { return m_body; }

private:
explicit OpaqueFilteredResponse(NonnullRefPtr<Response>);
Expand All @@ -247,7 +253,9 @@ class OpaqueRedirectFilteredResponse final : public FilteredResponse {
[[nodiscard]] virtual Status status() const override { return 0; }
[[nodiscard]] virtual ReadonlyBytes status_message() const override { return {}; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList> const& header_list() const override { return m_header_list; }
[[nodiscard]] virtual NonnullRefPtr<HeaderList>& header_list() override { return m_header_list; }
[[nodiscard]] virtual Optional<Body> const& body() const override { return m_body; }
[[nodiscard]] virtual Optional<Body>& body() override { return m_body; }

private:
explicit OpaqueRedirectFilteredResponse(NonnullRefPtr<Response>);
Expand Down

0 comments on commit 8f8fcfe

Please sign in to comment.