Преглед изворни кода

Revert "LibHTML: Rename parse_html() => parse_html_document()"

This reverts commit f6439789db9c02216baabb197017c7a79a63ba04.
Oops, I committed unrelated changes here, let me clean that up..
Andreas Kling пре 5 година
родитељ
комит
f5cf8d4ad8

+ 1 - 1
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_document(html);
+        auto html_document = parse_html(html);
         html_view->set_document(html_document);
 
         String page_and_section = model->page_and_section(tree_view->selection().first());

+ 27 - 30
Applications/IRCClient/IRCLogBuffer.cpp

@@ -1,6 +1,4 @@
 #include "IRCLogBuffer.h"
-#include <AK/StringBuilder.h>
-#include <LibHTML/DOM/DocumentFragment.h>
 #include <LibHTML/DOM/DocumentType.h>
 #include <LibHTML/DOM/ElementFactory.h>
 #include <LibHTML/DOM/HTMLBodyElement.h>
@@ -35,43 +33,42 @@ IRCLogBuffer::~IRCLogBuffer()
 {
 }
 
-static String timestamp_string()
+void IRCLogBuffer::add_message(char prefix, const String& name, const String& text, Color color)
 {
+    auto message_element = create_element(document(), "div");
+    message_element->set_attribute("style", String::format("color: %s;", color.to_string().characters()));
+    auto timestamp_element = create_element(document(), "span");
     auto now = time(nullptr);
     auto* tm = localtime(&now);
-    return String::format("%02u:%02u:%02u ", tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
+    auto timestamp_string = String::format("%02u:%02u:%02u ", tm->tm_hour, tm->tm_min, tm->tm_sec);
+    timestamp_element->append_child(adopt(*new Text(document(), timestamp_string)));
+    auto nick_element = create_element(document(), "b");
+    nick_element->append_child(*new Text(document(), String::format("<%c%s> ", prefix ? prefix : ' ', name.characters())));
+    auto text_element = create_element(document(), "span");
+    text_element->append_child(*new Text(document(), text));
+    message_element->append_child(timestamp_element);
+    message_element->append_child(nick_element);
+    message_element->append_child(text_element);
+    m_container_element->append_child(message_element);
 
-void IRCLogBuffer::add_message(char prefix, const String& name, const String& text, Color color)
-{
-    auto nick_string = String::format("&lt;%c%s&gt; ", prefix ? prefix : ' ', name.characters());
-    auto html = String::format(
-        "<div style=\"color: %s\">"
-        "<span>%s</span>"
-        "<b>%s</b>"
-        "<span>%s</span>"
-        "</div>",
-        color.to_string().characters(),
-        timestamp_string().characters(),
-        nick_string.characters(),
-        text.characters());
-    auto fragment = parse_html_fragment(*m_document, html);
-    m_container_element->append_child(fragment->remove_child(*fragment->first_child()));
     m_document->force_layout();
 }
 
 void IRCLogBuffer::add_message(const String& text, Color color)
 {
-    auto html = String::format(
-        "<div style=\"color: %s\">"
-        "<span>%s</span>"
-        "<span>%s</span>"
-        "</div>",
-        color.to_string().characters(),
-        timestamp_string().characters(),
-        text.characters());
-    auto fragment = parse_html_fragment(*m_document, html);
-    m_container_element->append_child(fragment->remove_child(*fragment->first_child()));
+    auto message_element = create_element(document(), "div");
+    message_element->set_attribute("style", String::format("color: %s;", color.to_string().characters()));
+    auto timestamp_element = create_element(document(), "span");
+    auto now = time(nullptr);
+    auto* tm = localtime(&now);
+    auto timestamp_string = String::format("%02u:%02u:%02u ", tm->tm_hour, tm->tm_min, tm->tm_sec);
+    timestamp_element->append_child(adopt(*new Text(document(), timestamp_string)));
+    auto text_element = create_element(document(), "span");
+    text_element->append_child(*new Text(document(), text));
+    message_element->append_child(timestamp_element);
+    message_element->append_child(text_element);
+    m_container_element->append_child(message_element);
+
     m_document->force_layout();
 }
 

+ 1 - 1
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_document(html_text);
+    auto html_document = parse_html(html_text);
     if (!html_document) {
         dbg() << "failed to parse HTML";
         return;

+ 1 - 1
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_document(data, url);
+            document = parse_html(data, url);
         }
         ASSERT(document);
         set_document(document);

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

+ 1 - 1
Libraries/LibHTML/Parser/HTMLParser.h

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

+ 1 - 1
Userland/html.cpp

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