diff options
| -rw-r--r-- | Applications/Help/main.cpp | 2 | ||||
| -rw-r--r-- | DevTools/HackStudio/Editor.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibHTML/HtmlView.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibHTML/Parser/HTMLParser.cpp | 8 | ||||
| -rw-r--r-- | Libraries/LibHTML/Parser/HTMLParser.h | 2 | ||||
| -rw-r--r-- | Userland/html.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index e6203e8a6b..c21907ad7c 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -80,7 +80,7 @@ int main(int argc, char* argv[]) ASSERT(success); 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); String page_and_section = model->page_and_section(tree_view->selection().first()); diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index 590f60090b..682149b356 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -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_document = parse_html(html_text); + auto html_document = parse_html_document(html_text); if (!html_document) { dbg() << "failed to parse HTML"; return; diff --git a/Libraries/LibHTML/HtmlView.cpp b/Libraries/LibHTML/HtmlView.cpp index b77b547f6e..9b2f88054a 100644 --- a/Libraries/LibHTML/HtmlView.cpp +++ b/Libraries/LibHTML/HtmlView.cpp @@ -314,7 +314,7 @@ void HtmlView::load(const URL& url) if (url.path().ends_with(".png")) { document = create_image_document(data, url); } else { - document = parse_html(data, url); + document = parse_html_document(data, url); } ASSERT(document); set_document(document); diff --git a/Libraries/LibHTML/Parser/HTMLParser.cpp b/Libraries/LibHTML/Parser/HTMLParser.cpp index 25cf52968e..bf1accfb75 100644 --- a/Libraries/LibHTML/Parser/HTMLParser.cpp +++ b/Libraries/LibHTML/Parser/HTMLParser.cpp @@ -34,7 +34,7 @@ static bool is_self_closing_tag(const StringView& tag_name) || 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; 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) { auto fragment = adopt(*new DocumentFragment(document)); - if (!parse_html(html, document, *fragment)) + if (!parse_html_document(html, document, *fragment)) return nullptr; 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); document->set_url(url); - bool success = parse_html(html, *document, *document); + bool success = parse_html_document(html, *document, *document); ASSERT(success); document->fixup(); diff --git a/Libraries/LibHTML/Parser/HTMLParser.h b/Libraries/LibHTML/Parser/HTMLParser.h index f852a158a7..46dc22428a 100644 --- a/Libraries/LibHTML/Parser/HTMLParser.h +++ b/Libraries/LibHTML/Parser/HTMLParser.h @@ -5,5 +5,5 @@ 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&); diff --git a/Userland/html.cpp b/Userland/html.cpp index 91cfdf6b1e..33562f42c3 100644 --- a/Userland/html.cpp +++ b/Userland/html.cpp @@ -34,7 +34,7 @@ int main(int argc, char** argv) } String html = String::copy(f->read_all()); - auto document = parse_html(html); + auto document = parse_html_document(html); auto window = GWindow::construct(); auto widget = HtmlView::construct(); |