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

LibHTML: Make the CSS parser return RefPtr's

Browse source 
It should be possible for the CSS parser to fail, and we'll know it
failed if it returns nullptr. Returning RefPtr's makes it actually
possible to return nullptr. :^)
This commit is contained in:
Andreas Kling 2019-11-07 17:58:54 +01:00
commit b88ff97537
Notes: sideshowbarker 2024-07-19 11:20:25 +09:00
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibHTML/CSS/StyleResolver.cpp
View file

@ -22,7 +22,7 @@ static StyleSheet& default_stylesheet()
if (!sheet) {
extern const char default_stylesheet_source[];
String css = default_stylesheet_source;
sheet = &parse_css(css).leak_ref();
sheet = parse_css(css).leak_ref();
}
return *sheet;
}

8
Libraries/LibHTML/Parser/CSSParser.cpp
View file

@ -376,7 +376,7 @@ public:
consume_whitespace_or_comments();
}
NonnullRefPtr<StyleSheet> parse_sheet()
RefPtr<StyleSheet> parse_sheet()
{
while (index < css.length()) {
parse_rule();
@ -385,7 +385,7 @@ public:
return StyleSheet::create(move(rules));
}
NonnullRefPtr<StyleDeclaration> parse_standalone_declaration()
RefPtr<StyleDeclaration> parse_standalone_declaration()
{
consume_whitespace_or_comments();
for (;;) {
@ -415,13 +415,13 @@ private:
StringView css;
};
NonnullRefPtr<StyleSheet> parse_css(const StringView& css)
RefPtr<StyleSheet> parse_css(const StringView& css)
{
CSSParser parser(css);
return parser.parse_sheet();
}
NonnullRefPtr<StyleDeclaration> parse_css_declaration(const StringView& css)
RefPtr<StyleDeclaration> parse_css_declaration(const StringView& css)
{
CSSParser parser(css);
return parser.parse_standalone_declaration();

4
Libraries/LibHTML/Parser/CSSParser.h
View file

@ -3,6 +3,6 @@
#include <AK/NonnullRefPtr.h>
#include <LibHTML/CSS/StyleSheet.h>
NonnullRefPtr<StyleSheet> parse_css(const StringView&);
NonnullRefPtr<StyleDeclaration> parse_css_declaration(const StringView&);
RefPtr<StyleSheet> parse_css(const StringView&);
RefPtr<StyleDeclaration> parse_css_declaration(const StringView&);