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

LibWeb: Remove redundant @import-handling code from CSSLoader

Browse source 
Now that `@import` rules load themselves, we don't want to also load
them here.
This commit is contained in:
Sam Atkins 2021-11-18 17:49:43 +00:00 • committed by Andreas Kling
parent 738e682ae0
commit 9d72815deb
2 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,8 +27,6 @@ void CSSLoader::load_from_text(const String& text)
m_style_sheet = CSS::CSSStyleSheet::create({}); m_style_sheet = CSS::CSSStyleSheet::create({});
m_style_sheet->set_owner_node(&m_owner_element); m_style_sheet->set_owner_node(&m_owner_element);
} }
load_next_import_if_needed();
} }
void CSSLoader::load_from_url(const AK::URL& url) void CSSLoader::load_from_url(const AK::URL& url)
@ -60,20 +58,11 @@ void CSSLoader::resource_did_load()
return; return;
} }
bool was_imported = m_style_sheet->for_first_not_loaded_import_rule([&](auto& rule) {
rule.set_style_sheet(sheet);
});
// Transfer the rules from the successfully parsed sheet into the sheet we've already inserted. // Transfer the rules from the successfully parsed sheet into the sheet we've already inserted.
// FIXME: @import rules need work.
if (!was_imported) {
m_style_sheet->set_rules(sheet->rules()); m_style_sheet->set_rules(sheet->rules());
}
if (on_load) if (on_load)
on_load(); on_load();
load_next_import_if_needed();
} }
void CSSLoader::resource_did_fail() void CSSLoader::resource_did_fail()
@ -81,21 +70,6 @@ void CSSLoader::resource_did_fail()
dbgln_if(CSS_LOADER_DEBUG, "CSSLoader: Resource did fail. URL: {}", resource()->url()); dbgln_if(CSS_LOADER_DEBUG, "CSSLoader: Resource did fail. URL: {}", resource()->url());
m_document_load_event_delayer.clear(); m_document_load_event_delayer.clear();
load_next_import_if_needed();
}
void CSSLoader::load_next_import_if_needed()
{
// Create load request for the first import which isn't loaded.
// TODO: We need to somehow handle infinite cycles in imports.
m_style_sheet->for_first_not_loaded_import_rule([&](auto& rule) {
dbgln_if(CSS_LOADER_DEBUG, "CSSLoader: Loading @import {}", rule.url());
LoadRequest request;
request.set_url(rule.url());
set_resource(ResourceLoader::the().load_resource(Resource::Type::Generic, request));
});
} }
} }

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

@ -21,8 +21,6 @@ public:
void load_from_text(const String&); void load_from_text(const String&);
void load_from_url(const AK::URL&); void load_from_url(const AK::URL&);
void load_next_import_if_needed();
RefPtr<CSS::CSSStyleSheet> style_sheet() const { return m_style_sheet; }; RefPtr<CSS::CSSStyleSheet> style_sheet() const { return m_style_sheet; };
Function<void()> on_load; Function<void()> on_load;