RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 02:17:35 +00:00
Code Issues Activity Actions

LibWeb: Add the Web::URL namespace and move URLEncoder to it

Browse source 
This namespace will be used for all interfaces defined in the URL
specification, like URL and URLSearchParams.

This has the unfortunate side-effect of requiring us to use the fully
qualified AK::URL name whenever we want to refer to the AK class, so
this commit also fixes all such references.
This commit is contained in:
Idan Horowitz 2021-09-13 00:33:23 +03:00 • committed by Andreas Kling
parent 2b78e227f2
commit 4629f2e4ad
54 changed files with 236 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Loader/CSSLoader.cpp
View file

@ -30,7 +30,7 @@ void CSSLoader::load_from_text(const String& text)
load_next_import_if_needed();
}
void CSSLoader::load_from_url(const URL& url)
void CSSLoader::load_from_url(const AK::URL& url)
{
m_style_sheet = CSS::CSSStyleSheet::create({});
m_style_sheet->set_owner_node(&m_owner_element);

2
Userland/Libraries/LibWeb/Loader/CSSLoader.h
View file

@ -17,7 +17,7 @@ public:
explicit CSSLoader(DOM::Element& owner_element);
void load_from_text(const String&);
void load_from_url(const URL&);
void load_from_url(const AK::URL&);
void load_next_import_if_needed();

2
Userland/Libraries/LibWeb/Loader/ContentFilter.cpp
View file

@ -23,7 +23,7 @@ ContentFilter::~ContentFilter()
{
}
bool ContentFilter::is_filtered(const URL& url) const
bool ContentFilter::is_filtered(const AK::URL& url) const
{
auto url_string = url.to_string();

2
Userland/Libraries/LibWeb/Loader/ContentFilter.h
View file

@ -15,7 +15,7 @@ class ContentFilter {
public:
static ContentFilter& the();
bool is_filtered(const URL&) const;
bool is_filtered(const AK::URL&) const;
void add_pattern(const String&);
private:

8
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -162,7 +162,7 @@ bool FrameLoader::load(LoadRequest& request, Type type)
return true;
if (url.protocol() == "http" || url.protocol() == "https") {
URL favicon_url;
AK::URL favicon_url;
favicon_url.set_protocol(url.protocol());
favicon_url.set_host(url.host());
favicon_url.set_port(url.port());
@ -195,7 +195,7 @@ bool FrameLoader::load(LoadRequest& request, Type type)
return true;
}
bool FrameLoader::load(const URL& url, Type type)
bool FrameLoader::load(const AK::URL& url, Type type)
{
dbgln_if(SPAM_DEBUG, "FrameLoader::load: {}", url);
@ -208,7 +208,7 @@ bool FrameLoader::load(const URL& url, Type type)
return load(request, type);
}
void FrameLoader::load_html(const StringView& html, const URL& url)
void FrameLoader::load_html(const StringView& html, const AK::URL& url)
{
auto document = DOM::Document::create(url);
HTML::HTMLDocumentParser parser(document, html, "utf-8");
@ -219,7 +219,7 @@ void FrameLoader::load_html(const StringView& html, const URL& url)
// FIXME: Use an actual templating engine (our own one when it's built, preferably
// with a way to check these usages at compile time)
void FrameLoader::load_error_page(const URL& failed_url, const String& error)
void FrameLoader::load_error_page(const AK::URL& failed_url, const String& error)
{
auto error_page_url = "file:///res/html/error.html";
ResourceLoader::the().load(

6
Userland/Libraries/LibWeb/Loader/FrameLoader.h
View file

@ -26,10 +26,10 @@ public:
explicit FrameLoader(BrowsingContext&);
~FrameLoader();
bool load(const URL&, Type);
bool load(const AK::URL&, Type);
bool load(LoadRequest&, Type);
void load_html(const StringView&, const URL&);
void load_html(const StringView&, const AK::URL&);
BrowsingContext& browsing_context() { return m_browsing_context; }
const BrowsingContext& browsing_context() const { return m_browsing_context; }
@ -39,7 +39,7 @@ private:
virtual void resource_did_load() override;
virtual void resource_did_fail() override;
void load_error_page(const URL& failed_url, const String& error_message);
void load_error_page(const AK::URL& failed_url, const String& error_message);
void load_favicon(RefPtr<Gfx::Bitmap> bitmap = nullptr);
bool parse_document(DOM::Document&, const ByteBuffer& data);

2
Userland/Libraries/LibWeb/Loader/ImageLoader.cpp
View file

@ -20,7 +20,7 @@ ImageLoader::ImageLoader(DOM::Element& owner_element)
{
}
void ImageLoader::load(const URL& url)
void ImageLoader::load(const AK::URL& url)
{
m_loading_state = LoadingState::Loading;

2
Userland/Libraries/LibWeb/Loader/ImageLoader.h
View file

@ -16,7 +16,7 @@ class ImageLoader : public ImageResourceClient {
public:
ImageLoader(DOM::Element& owner_element);
void load(const URL&);
void load(const AK::URL&);
const Gfx::Bitmap* bitmap(size_t index) const;
size_t current_frame_index() const { return m_current_frame_index; }

2
Userland/Libraries/LibWeb/Loader/LoadRequest.cpp
View file

@ -10,7 +10,7 @@
namespace Web {
LoadRequest LoadRequest::create_for_url_on_page(const URL& url, Page* page)
LoadRequest LoadRequest::create_for_url_on_page(const AK::URL& url, Page* page)
{
LoadRequest request;
request.set_url(url);

8
Userland/Libraries/LibWeb/Loader/LoadRequest.h
View file

@ -21,12 +21,12 @@ public:
{
}
static LoadRequest create_for_url_on_page(const URL& url, Page* page);
static LoadRequest create_for_url_on_page(const AK::URL& url, Page* page);
bool is_valid() const { return m_url.is_valid(); }
const URL& url() const { return m_url; }
void set_url(const URL& url) { m_url = url; }
const AK::URL& url() const { return m_url; }
void set_url(const AK::URL& url) { m_url = url; }
const String& method() const { return m_method; }
void set_method(const String& method) { m_method = method; }
@ -65,7 +65,7 @@ public:
const HashMap<String, String>& headers() const { return m_headers; }
private:
URL m_url;
AK::URL m_url;
String m_method { "GET" };
HashMap<String, String> m_headers;
ByteBuffer m_body;

2
Userland/Libraries/LibWeb/Loader/Resource.h
View file

@ -44,7 +44,7 @@ public:
bool has_encoded_data() const { return !m_encoded_data.is_empty(); }
const URL& url() const { return m_request.url(); }
const AK::URL& url() const { return m_request.url(); }
const ByteBuffer& encoded_data() const { return m_encoded_data; }
const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers() const { return m_response_headers; }

2
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -218,7 +218,7 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, con
error_callback(not_implemented_error, {});
}
void ResourceLoader::load(const URL& url, Function<void(ReadonlyBytes, const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers, Optional<u32> status_code)> success_callback, Function<void(const String&, Optional<u32> status_code)> error_callback)
void ResourceLoader::load(const AK::URL& url, Function<void(ReadonlyBytes, const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers, Optional<u32> status_code)> success_callback, Function<void(const String&, Optional<u32> status_code)> error_callback)
{
LoadRequest request;
request.set_url(url);

2
Userland/Libraries/LibWeb/Loader/ResourceLoader.h
View file

@ -33,7 +33,7 @@ public:
RefPtr<Resource> load_resource(Resource::Type, LoadRequest&);
void load(LoadRequest&, Function<void(ReadonlyBytes, const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers, Optional<u32> status_code)> success_callback, Function<void(const String&, Optional<u32> status_code)> error_callback = nullptr);
void load(const URL&, Function<void(ReadonlyBytes, const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers, Optional<u32> status_code)> success_callback, Function<void(const String&, Optional<u32> status_code)> error_callback = nullptr);
void load(const AK::URL&, Function<void(ReadonlyBytes, const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers, Optional<u32> status_code)> success_callback, Function<void(const String&, Optional<u32> status_code)> error_callback = nullptr);
void load_sync(LoadRequest&, Function<void(ReadonlyBytes, const HashMap<String, String, CaseInsensitiveStringTraits>& response_headers, Optional<u32> status_code)> success_callback, Function<void(const String&, Optional<u32> status_code)> error_callback = nullptr);
Function<void()> on_load_counter_change;