RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:38:11 +00:00
Code Issues Activity Actions

LibHTML: Rename parse_html() => parse_html_document()

Browse source
This commit is contained in:
Andreas Kling 2019-11-06 20:52:18 +01:00
parent f5cf8d4ad8
commit 794f2d5645
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/Help/main.cpp
View file

@ -80,7 +80,7 @@ int main(int argc, char* argv[])
ASSERT(success); ASSERT(success);
String html = md_document.render_to_html(); String html = md_document.render_to_html();
auto html_document = parse_html(html); auto html_document = parse_html_document(html);
html_view->set_document(html_document); html_view->set_document(html_document);
String page_and_section = model->page_and_section(tree_view->selection().first()); String page_and_section = model->page_and_section(tree_view->selection().first());

2
DevTools/HackStudio/Editor.cpp
View file

@ -121,7 +121,7 @@ void Editor::show_documentation_tooltip_if_available(const String& hovered_token
auto html_text = man_document.render_to_html(); auto html_text = man_document.render_to_html();
auto html_document = parse_html(html_text); auto html_document = parse_html_document(html_text);
if (!html_document) { if (!html_document) {
dbg() << "failed to parse HTML"; dbg() << "failed to parse HTML";
return; return;

2
Libraries/LibHTML/HtmlView.cpp
View file

@ -314,7 +314,7 @@ void HtmlView::load(const URL& url)
if (url.path().ends_with(".png")) { if (url.path().ends_with(".png")) {
document = create_image_document(data, url); document = create_image_document(data, url);
} else { } else {
document = parse_html(data, url); document = parse_html_document(data, url);
} }
ASSERT(document); ASSERT(document);
set_document(document); set_document(document);

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

@ -34,7 +34,7 @@ static bool is_self_closing_tag(const StringView& tag_name)
|| tag_name == "wbr"; || tag_name == "wbr";
} }
static bool parse_html(const StringView& html, Document& document, ParentNode& root) static bool parse_html_document(const StringView& html, Document& document, ParentNode& root)
{ {
NonnullRefPtrVector<ParentNode> node_stack; NonnullRefPtrVector<ParentNode> node_stack;
node_stack.append(root); node_stack.append(root);
@ -313,17 +313,17 @@ static bool parse_html(const StringView& html, Document& document, ParentNode& r
RefPtr<DocumentFragment> parse_html_fragment(Document& document, const StringView& html) RefPtr<DocumentFragment> parse_html_fragment(Document& document, const StringView& html)
{ {
auto fragment = adopt(*new DocumentFragment(document)); auto fragment = adopt(*new DocumentFragment(document));
if (!parse_html(html, document, *fragment)) if (!parse_html_document(html, document, *fragment))
return nullptr; return nullptr;
return fragment; return fragment;
} }
NonnullRefPtr<Document> parse_html(const StringView& html, const URL& url) NonnullRefPtr<Document> parse_html_document(const StringView& html, const URL& url)
{ {
auto document = adopt(*new Document); auto document = adopt(*new Document);
document->set_url(url); document->set_url(url);
bool success = parse_html(html, *document, *document); bool success = parse_html_document(html, *document, *document);
ASSERT(success); ASSERT(success);
document->fixup(); document->fixup();

2
Libraries/LibHTML/Parser/HTMLParser.h
View file

@ -5,5 +5,5 @@
class DocumentFragment; class DocumentFragment;
NonnullRefPtr<Document> parse_html(const StringView&, const URL& = URL()); NonnullRefPtr<Document> parse_html_document(const StringView&, const URL& = URL());
RefPtr<DocumentFragment> parse_html_fragment(Document&, const StringView&); RefPtr<DocumentFragment> parse_html_fragment(Document&, const StringView&);

2
Userland/html.cpp
View file

@ -34,7 +34,7 @@ int main(int argc, char** argv)
} }
String html = String::copy(f->read_all()); String html = String::copy(f->read_all());
auto document = parse_html(html); auto document = parse_html_document(html);
auto window = GWindow::construct(); auto window = GWindow::construct();
auto widget = HtmlView::construct(); auto widget = HtmlView::construct();