mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-09 01:29:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Qualify uses of LibURL

Browse source 
To prepare for introducing a CSS::URL type, we need to qualify any use
of LibURL as `::URL::foo` instead of `URL::foo` so the compiler doesn't
get confused.

Many of these uses will be replaced, but I don't want to mix this in
with what will likely already be a large change.
This commit is contained in:
Sam Atkins 2025-04-08 13:35:26 +01:00 • committed by Tim Ledbetter
commit c82f4b46a2
Notes: github-actions[bot] 2025-04-09 17:48:07 +00:00
24 changed files with 77 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibWeb/CSS/StyleValues/FontSourceStyleValue.cpp
View file

@ -34,7 +34,7 @@ String FontSourceStyleValue::to_string(SerializationMode) const
builder.append(')');
return builder.to_string_without_validation();
},
[this](URL::URL const& url) {
[this](::URL::URL const& url) {
// <url> [ format(<font-format>)]? [ tech( <font-tech>#)]?
// FIXME: tech()
StringBuilder builder;
@ -59,8 +59,8 @@ bool FontSourceStyleValue::properties_equal(FontSourceStyleValue const& other) c
}
return false;
},
[&other](URL::URL const& url) {
if (auto* other_url = other.m_source.get_pointer<URL::URL>()) {
[&other](::URL::URL const& url) {
if (auto* other_url = other.m_source.get_pointer<::URL::URL>()) {
return url == *other_url;
}
return false;

2
Libraries/LibWeb/CSS/StyleValues/FontSourceStyleValue.h
View file

@ -16,7 +16,7 @@ public:
struct Local {
NonnullRefPtr<CSSStyleValue> name;
};
using Source = Variant<Local, URL::URL>;
using Source = Variant<Local, ::URL::URL>;
static ValueComparingNonnullRefPtr<FontSourceStyleValue> create(Source source, Optional<FlyString> format)
{

2
Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.cpp
View file

@ -20,7 +20,7 @@
namespace Web::CSS {
ImageStyleValue::ImageStyleValue(URL::URL const& url)
ImageStyleValue::ImageStyleValue(::URL::URL const& url)
: AbstractImageStyleValue(Type::Image)
, m_url(url)
{

6
Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.h
View file

@ -25,7 +25,7 @@ class ImageStyleValue final
using Base = AbstractImageStyleValue;
public:
static ValueComparingNonnullRefPtr<ImageStyleValue> create(URL::URL const& url)
static ValueComparingNonnullRefPtr<ImageStyleValue> create(::URL::URL const& url)
{
return adopt_ref(*new (nothrow) ImageStyleValue(url));
}
@ -53,14 +53,14 @@ public:
GC::Ptr<HTML::DecodedImageData> image_data() const;
private:
ImageStyleValue(URL::URL const&);
ImageStyleValue(::URL::URL const&);
GC::Ptr<HTML::SharedResourceRequest> m_resource_request;
void animate();
Gfx::ImmutableBitmap const* bitmap(size_t frame_index, Gfx::IntSize = {}) const;
URL::URL m_url;
::URL::URL m_url;
WeakPtr<DOM::Document> m_document;
size_t m_current_frame_index { 0 };

8
Libraries/LibWeb/CSS/StyleValues/URLStyleValue.h
View file

@ -14,14 +14,14 @@ namespace Web::CSS {
class URLStyleValue final : public StyleValueWithDefaultOperators<URLStyleValue> {
public:
static ValueComparingNonnullRefPtr<URLStyleValue> create(URL::URL const& url)
static ValueComparingNonnullRefPtr<URLStyleValue> create(::URL::URL const& url)
{
return adopt_ref(*new (nothrow) URLStyleValue(url));
}
virtual ~URLStyleValue() override = default;
URL::URL const& url() const { return m_url; }
::URL::URL const& url() const { return m_url; }
bool properties_equal(URLStyleValue const& other) const { return m_url == other.m_url; }
@ -31,13 +31,13 @@ public:
}
private:
URLStyleValue(URL::URL const& url)
URLStyleValue(::URL::URL const& url)
: StyleValueWithDefaultOperators(Type::URL)
, m_url(url)
{
}
URL::URL m_url;
::URL::URL m_url;
};
}