diff --git a/Libraries/LibHTML/DOM/HTMLLinkElement.cpp b/Libraries/LibHTML/DOM/HTMLLinkElement.cpp index adf25d92aa..7e2c238e91 100644 --- a/Libraries/LibHTML/DOM/HTMLLinkElement.cpp +++ b/Libraries/LibHTML/DOM/HTMLLinkElement.cpp @@ -27,7 +27,7 @@ void HTMLLinkElement::inserted_into(Node&) return; } auto data = file->read_all(); - auto sheet = parse_css(String::copy(data)); + auto sheet = parse_css(data); if (!sheet) { dbg() << "Failed to parse " << url.to_string(); diff --git a/Libraries/LibHTML/HtmlView.cpp b/Libraries/LibHTML/HtmlView.cpp index 8c42658512..1724b54114 100644 --- a/Libraries/LibHTML/HtmlView.cpp +++ b/Libraries/LibHTML/HtmlView.cpp @@ -178,7 +178,7 @@ void HtmlView::load(const URL& url) return; } - String html = String::copy(f->read_all()); + auto html = f->read_all(); auto document = parse_html(html, url); document->normalize(); diff --git a/Libraries/LibHTML/Parser/CSSParser.cpp b/Libraries/LibHTML/Parser/CSSParser.cpp index e9e2ff939c..7b43b046ac 100644 --- a/Libraries/LibHTML/Parser/CSSParser.cpp +++ b/Libraries/LibHTML/Parser/CSSParser.cpp @@ -301,16 +301,16 @@ private: int index = 0; - String css; + StringView css; }; -NonnullRefPtr parse_css(const String& css) +NonnullRefPtr parse_css(const StringView& css) { CSSParser parser(css); return parser.parse_sheet(); } -NonnullRefPtr parse_css_declaration(const String& css) +NonnullRefPtr parse_css_declaration(const StringView& css) { CSSParser parser(css); return parser.parse_standalone_declaration(); diff --git a/Libraries/LibHTML/Parser/CSSParser.h b/Libraries/LibHTML/Parser/CSSParser.h index 053e2fbde8..44e57f5dd5 100644 --- a/Libraries/LibHTML/Parser/CSSParser.h +++ b/Libraries/LibHTML/Parser/CSSParser.h @@ -3,6 +3,6 @@ #include #include -NonnullRefPtr parse_css(const String&); -NonnullRefPtr parse_css_declaration(const String&); +NonnullRefPtr parse_css(const StringView&); +NonnullRefPtr parse_css_declaration(const StringView&); diff --git a/Libraries/LibHTML/Parser/HTMLParser.cpp b/Libraries/LibHTML/Parser/HTMLParser.cpp index 9593799576..d9fcde815e 100644 --- a/Libraries/LibHTML/Parser/HTMLParser.cpp +++ b/Libraries/LibHTML/Parser/HTMLParser.cpp @@ -57,7 +57,7 @@ static bool is_valid_in_attribute_name(char ch) return isalnum(ch) || ch == '_' || ch == '-'; } -static bool is_self_closing_tag(const String& tag_name) +static bool is_self_closing_tag(const StringView& tag_name) { return tag_name == "area" || tag_name == "base" @@ -75,7 +75,7 @@ static bool is_self_closing_tag(const String& tag_name) || tag_name == "wbr"; } -NonnullRefPtr parse_html(const String& html, const URL& url) +NonnullRefPtr parse_html(const StringView& html, const URL& url) { NonnullRefPtrVector node_stack; diff --git a/Libraries/LibHTML/Parser/HTMLParser.h b/Libraries/LibHTML/Parser/HTMLParser.h index eb57a42465..7e0bf177ab 100644 --- a/Libraries/LibHTML/Parser/HTMLParser.h +++ b/Libraries/LibHTML/Parser/HTMLParser.h @@ -3,5 +3,5 @@ #include #include -NonnullRefPtr parse_html(const String&, const URL& = URL()); +NonnullRefPtr parse_html(const StringView&, const URL& = URL());