load useragent stylesheet again

gosub-io · Sep 29, 2024 · 8338cc9 · 8338cc9
1 parent d3f0c51
commit 8338cc9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/crates/gosub_css3/src/system.rs b/crates/gosub_css3/src/system.rs
@@ -5,7 +5,7 @@ use crate::matcher::property_definitions::get_css_definitions;
 use crate::matcher::shorthands::FixList;
 use crate::matcher::styling::{match_selector, CssProperties, CssProperty, DeclarationProperty};
 use crate::stylesheet::{CssDeclaration, CssValue, Specificity};
-use crate::Css3;
+use crate::{load_default_useragent_stylesheet, Css3};
 use gosub_shared::document::DocumentHandle;
 use gosub_shared::errors::CssResult;
 use gosub_shared::node::NodeId;
@@ -97,6 +97,10 @@ impl CssSystem for Css3System {
     fn inheritance<T: RenderTree<Self>>(tree: &mut T) {
         Self::resolve_inheritance(tree, tree.root(), &Vec::new());
     }
+
+    fn load_default_useragent_stylesheet() -> Self::Stylesheet {
+        load_default_useragent_stylesheet()
+    }
 }
 
 impl Css3System {

diff --git a/crates/gosub_render_utils/src/render_tree.rs b/crates/gosub_render_utils/src/render_tree.rs
@@ -237,7 +237,9 @@ impl<L: Layouter, D: Document<C>, C: CssSystem> RenderTree<L, D, C> {
             else {
                 //we need to remove it  from the parent in the render tree and from the document
 
-                todo!("unrenderable node");
+                // todo!("unrenderable node");
+
+                continue;
             };
 
             let data = node.data();

diff --git a/crates/gosub_renderer/src/render_tree.rs b/crates/gosub_renderer/src/render_tree.rs
@@ -87,11 +87,11 @@ pub(crate) fn load_html_rendertree<L: Layouter, P: Html5Parser<C>, C: CssSystem>
         eprintln!("Parse error: {:?}", error);
     }
 
-    _ = doc_handle.get_mut();
+    let mut doc = doc_handle.get_mut();
 
-    // doc.add_stylesheet(C::load_default_useragent_stylesheet()?);
+    doc.add_stylesheet(C::load_default_useragent_stylesheet());
 
-    // drop(doc);
+    drop(doc);
 
     generate_render_tree(DocumentHandle::clone(&doc_handle))
 }
diff --git a/crates/gosub_shared/src/traits/css3.rs b/crates/gosub_shared/src/traits/css3.rs
@@ -39,6 +39,8 @@ pub trait CssSystem: Clone {
     ) -> Option<Self::PropertyMap>;
 
     fn inheritance<T: RenderTree<Self>>(tree: &mut T);
+
+    fn load_default_useragent_stylesheet() -> Self::Stylesheet;
 }
 
 pub trait CssStylesheet: PartialEq {