From 3b3329d35bd45c6c05ce825e10dc32fbfe1a36cf Mon Sep 17 00:00:00 2001 From: Asami Doi Date: Sun, 2 Jun 2024 22:39:26 +0200 Subject: [PATCH] rename html/dom.rs to html/parser.rs --- core/src/renderer/dom/activation_behavior.rs | 6 +++--- core/src/renderer/dom/api.rs | 2 +- core/src/renderer/dom/event.rs | 2 +- core/src/renderer/dom/window.rs | 4 ++-- core/src/renderer/html/html_builder.rs | 2 +- core/src/renderer/html/mod.rs | 2 +- core/src/renderer/html/{dom.rs => parser.rs} | 0 core/src/renderer/js/runtime.rs | 4 ++-- core/src/renderer/layout/computed_style.rs | 2 +- core/src/renderer/layout/layout_object.rs | 2 +- core/src/renderer/layout/layout_view.rs | 2 +- core/src/renderer/page.rs | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) rename core/src/renderer/html/{dom.rs => parser.rs} (100%) diff --git a/core/src/renderer/dom/activation_behavior.rs b/core/src/renderer/dom/activation_behavior.rs index 6664c6e..b957e9a 100644 --- a/core/src/renderer/dom/activation_behavior.rs +++ b/core/src/renderer/dom/activation_behavior.rs @@ -4,9 +4,9 @@ //! https://dom.spec.whatwg.org/#eventtarget-activation-behavior use crate::renderer::dom::event::Event; -use crate::renderer::html::dom::ElementKind; -use crate::renderer::html::dom::Node; -use crate::renderer::html::dom::NodeKind; +use crate::renderer::html::parser::ElementKind; +use crate::renderer::html::parser::Node; +use crate::renderer::html::parser::NodeKind; use alloc::rc::Rc; use core::cell::RefCell; diff --git a/core/src/renderer/dom/api.rs b/core/src/renderer/dom/api.rs index 2d88ad0..08af8d6 100644 --- a/core/src/renderer/dom/api.rs +++ b/core/src/renderer/dom/api.rs @@ -1,4 +1,4 @@ -use crate::renderer::html::dom::{Element, ElementKind, Node, NodeKind}; +use crate::renderer::html::parser::{Element, ElementKind, Node, NodeKind}; use alloc::rc::Rc; use alloc::string::String; use alloc::string::ToString; diff --git a/core/src/renderer/dom/event.rs b/core/src/renderer/dom/event.rs index f61aded..a420c2f 100644 --- a/core/src/renderer/dom/event.rs +++ b/core/src/renderer/dom/event.rs @@ -2,7 +2,7 @@ //! DOM Living Standard: https://dom.spec.whatwg.org/#events //! UI Events W3C Working Draft: https://www.w3.org/TR/uievents/ -use crate::renderer::html::dom::NodeKind; +use crate::renderer::html::parser::NodeKind; use alloc::boxed::Box; use alloc::string::String; diff --git a/core/src/renderer/dom/window.rs b/core/src/renderer/dom/window.rs index f360cbc..7fc0ac8 100644 --- a/core/src/renderer/dom/window.rs +++ b/core/src/renderer/dom/window.rs @@ -2,8 +2,8 @@ //! https://html.spec.whatwg.org/multipage/nav-history-apis.html#window use crate::browser::Browser; -use crate::renderer::html::dom::Node; -use crate::renderer::html::dom::NodeKind; +use crate::renderer::html::parser::Node; +use crate::renderer::html::parser::NodeKind; use crate::renderer::page::Page; use alloc::rc::Rc; use alloc::rc::Weak; diff --git a/core/src/renderer/html/html_builder.rs b/core/src/renderer/html/html_builder.rs index 25d1c35..d8e9f48 100644 --- a/core/src/renderer/html/html_builder.rs +++ b/core/src/renderer/html/html_builder.rs @@ -1,7 +1,7 @@ //! This is a helper function to construct HTML string from DOM tree. use crate::alloc::string::ToString; -use crate::renderer::html::dom::{Node, NodeKind}; +use crate::renderer::html::parser::{Node, NodeKind}; use alloc::rc::Rc; use alloc::string::String; use core::cell::RefCell; diff --git a/core/src/renderer/html/mod.rs b/core/src/renderer/html/mod.rs index fb43e0c..94d650d 100644 --- a/core/src/renderer/html/mod.rs +++ b/core/src/renderer/html/mod.rs @@ -1,4 +1,4 @@ pub mod attribute; -pub mod dom; pub mod html_builder; +pub mod parser; pub mod token; diff --git a/core/src/renderer/html/dom.rs b/core/src/renderer/html/parser.rs similarity index 100% rename from core/src/renderer/html/dom.rs rename to core/src/renderer/html/parser.rs diff --git a/core/src/renderer/js/runtime.rs b/core/src/renderer/js/runtime.rs index 5f85143..b022cc7 100644 --- a/core/src/renderer/js/runtime.rs +++ b/core/src/renderer/js/runtime.rs @@ -1,6 +1,6 @@ use crate::renderer::dom::api::get_element_by_id; -use crate::renderer::html::dom::Node as DomNode; -use crate::renderer::html::dom::NodeKind as DomNodeKind; +use crate::renderer::html::parser::Node as DomNode; +use crate::renderer::html::parser::NodeKind as DomNodeKind; use crate::renderer::js::ast::Node; use crate::renderer::js::ast::Program; use alloc::format; diff --git a/core/src/renderer/layout/computed_style.rs b/core/src/renderer/layout/computed_style.rs index 29e0b75..0b75801 100644 --- a/core/src/renderer/layout/computed_style.rs +++ b/core/src/renderer/layout/computed_style.rs @@ -2,7 +2,7 @@ //! https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/style/computed_style.h //! https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Cascade_and_inheritance -use crate::renderer::html::dom::{ElementKind, Node, NodeKind}; +use crate::renderer::html::parser::{ElementKind, Node, NodeKind}; use crate::renderer::layout::color::*; use alloc::rc::Rc; use core::cell::RefCell; diff --git a/core/src/renderer/layout/layout_object.rs b/core/src/renderer/layout/layout_object.rs index 2df7818..79f8057 100644 --- a/core/src/renderer/layout/layout_object.rs +++ b/core/src/renderer/layout/layout_object.rs @@ -8,7 +8,7 @@ use crate::browser::Browser; use crate::display_item::DisplayItem; use crate::renderer::css::cssom::*; use crate::renderer::css::token::CssToken; -use crate::renderer::html::dom::*; +use crate::renderer::html::parser::*; use crate::renderer::layout::color::*; use crate::renderer::layout::computed_style::*; use crate::renderer::layout::layout_point::LayoutPoint; diff --git a/core/src/renderer/layout/layout_view.rs b/core/src/renderer/layout/layout_view.rs index 40087b9..d5298a4 100644 --- a/core/src/renderer/layout/layout_view.rs +++ b/core/src/renderer/layout/layout_view.rs @@ -6,7 +6,7 @@ use crate::browser::Browser; use crate::display_item::DisplayItem; use crate::renderer::css::cssom::*; use crate::renderer::dom::api::get_target_element_node; -use crate::renderer::html::dom::{ElementKind, Node, NodeKind}; +use crate::renderer::html::parser::{ElementKind, Node, NodeKind}; use crate::renderer::layout::computed_style::*; use crate::renderer::layout::layout_object::LayoutObject; use crate::renderer::layout::layout_point::LayoutPoint; diff --git a/core/src/renderer/page.rs b/core/src/renderer/page.rs index c008aff..6f57857 100644 --- a/core/src/renderer/page.rs +++ b/core/src/renderer/page.rs @@ -14,8 +14,8 @@ use crate::renderer::css::cssom::StyleSheet; use crate::renderer::css::token::CssTokenizer; use crate::renderer::dom::api::{get_js_content, get_style_content}; use crate::renderer::dom::window::Window; -use crate::renderer::html::dom::HtmlParser; use crate::renderer::html::html_builder::dom_to_html; +use crate::renderer::html::parser::HtmlParser; use crate::renderer::html::token::HtmlTokenizer; use crate::renderer::js::ast::JsParser; use crate::renderer::js::runtime::JsRuntime;