Moved function to sync

crates/gosub_interface/src/draw.rs

@@ -36,7 +36,7 @@ pub trait TreeDrawer<C: HasDrawComponents> {
         layouter: C::Layouter,
         // Debug flag
         debug: bool,
-    ) -> impl Future<Output = gosub_shared::types::Result<Self>>
+    ) -> gosub_shared::types::Result<Self>
     where
         Self: Sized;
 

crates/gosub_renderer/src/draw.rs

@@ -2,7 +2,7 @@ use crate::debug::scale::px_scale;
 use crate::draw::img::request_img;
 use crate::draw::img_cache::ImageCache;
 use crate::draw::testing::{test_add_element, test_restyle_element};
-use crate::render_tree::{load_html_rendertree, load_html_rendertree_fetcher};
+use crate::render_tree::{load_html_rendertree, load_html_rendertree_fetcher, load_html_rendertree_source};
 use anyhow::anyhow;
 use gosub_interface::config::{HasDrawComponents, HasHtmlParser};
 use gosub_interface::css3::{CssProperty, CssPropertyMap, CssValue};
@@ -217,8 +217,9 @@ where
         Ok(Self::new(rt, layouter, fetcher, debug))
     }
 
-    async fn from_source(url: Url, source_html: &str, layouter: C::Layouter, debug: bool) -> Result<Self> {
-        let (rt, fetcher) = load_html_rendertree::<C>(url, Some(source_html)).await?;
+    fn from_source(url: Url, source_html: &str, layouter: C::Layouter, debug: bool) -> Result<Self> {
+        let fetcher = Fetcher::new(url.clone());
+        let rt = load_html_rendertree_source::<C>(url, source_html)?;
 
         Ok(Self::new(rt, layouter, fetcher, debug))
     }

crates/gosub_renderer/src/render_tree.rs

@@ -20,14 +20,16 @@ pub(crate) async fn load_html_rendertree<
     let fetcher = Fetcher::new(url.clone());
 
     let rt = match source {
-        Some(source) => load_html_rendertree_source::<C>(url, source).await?,
+        Some(source) => load_html_rendertree_source::<C>(url, source)?,
         None => load_html_rendertree_fetcher::<C>(url, &fetcher).await?,
     };
 
     Ok((rt, fetcher))
 }
 
-pub(crate) async fn load_html_rendertree_source<
+// Generate a render tree from the given source HTML. THe URL is needed to resolve relative URLs
+// and also to set the base URL for the document.
+pub(crate) fn load_html_rendertree_source<
     C: HasRenderTree<LayoutTree = RenderTree<C>, RenderTree = RenderTree<C>> + HasHtmlParser,
 >(
     url: Url,
@@ -53,6 +55,7 @@ pub(crate) async fn load_html_rendertree_source<
     generate_render_tree(DocumentHandle::clone(&doc_handle))
 }
 
+/// Generates a render tree from the given URL. The complete HTML source is fetched from the URL async.
 pub(crate) async fn load_html_rendertree_fetcher<
     C: HasRenderTree<LayoutTree = RenderTree<C>, RenderTree = RenderTree<C>> + HasHtmlParser,
 >(
@@ -73,5 +76,5 @@ pub(crate) async fn load_html_rendertree_fetcher<
         bail!("Unsupported url scheme: {}", url.scheme());
     };
 
-    load_html_rendertree_source(url, &html).await
+    load_html_rendertree_source(url, &html)
 }