fix: remove the old message

Author: mTvare6

editor/src/messages/frontend/frontend_message.rs

@@ -8,16 +8,10 @@ use crate::messages::portfolio::document::utility_types::wires::{WirePath, WireP
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::HintData;
 use graph_craft::document::NodeId;
-use graphene_std::application_io;
+use graphene_std::raster::Image;
+use graphene_std::raster::TransformImage;
 use graphene_std::raster::color::Color;
 use graphene_std::text::Font;
-use web_sys::HtmlCanvasElement;
-
-#[derive(Debug, Clone, dyn_any::DynAny, Default, PartialEq)]
-pub struct FrontendHtmlCanvases(pub Vec<application_io::SurfaceHandleFrame<HtmlCanvasElement>>);
-
-unsafe impl Send for FrontendHtmlCanvases {}
-unsafe impl Sync for FrontendHtmlCanvases {}
 
 #[impl_message(Message, Frontend)]
 #[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize, specta::Type)]
@@ -187,9 +181,8 @@ pub enum FrontendMessage {
 	UpdateDocumentArtwork {
 		svg: String,
 	},
-	UpdateCanvasImage {
-		#[serde(skip)]
-		canvases: FrontendHtmlCanvases,
+	UpdateImageData {
+		image_data: Vec<(u64, Image<Color>, TransformImage)>,
 	},
 	UpdateDocumentBarLayout {
 		#[serde(rename = "layoutTarget")]

editor/src/messages/frontend/mod.rs

@@ -3,4 +3,4 @@ mod frontend_message;
 pub mod utility_types;
 
 #[doc(inline)]
-pub use frontend_message::{FrontendMessage, FrontendMessageDiscriminant, FrontendHtmlCanvases};
+pub use frontend_message::{FrontendMessage, FrontendMessageDiscriminant};

editor/src/messages/prelude.rs

@@ -15,13 +15,7 @@ pub use crate::messages::input_mapper::key_mapping::{KeyMappingMessage, KeyMappi
 pub use crate::messages::input_mapper::{InputMapperMessage, InputMapperMessageContext, InputMapperMessageDiscriminant, InputMapperMessageHandler};
 pub use crate::messages::input_preprocessor::{InputPreprocessorMessage, InputPreprocessorMessageContext, InputPreprocessorMessageDiscriminant, InputPreprocessorMessageHandler};
 pub use crate::messages::layout::{LayoutMessage, LayoutMessageDiscriminant, LayoutMessageHandler};
-pub use crate::messages::portfolio::document::graph_operation::{GraphOperationMessage, GraphOperationMessageContext, GraphOperationMessageDiscriminant, GraphOperationMessageHandler};
-pub use crate::messages::portfolio::document::navigation::{NavigationMessage, NavigationMessageContext, NavigationMessageDiscriminant, NavigationMessageHandler};
-pub use crate::messages::portfolio::document::node_graph::{NodeGraphMessage, NodeGraphMessageDiscriminant, NodeGraphMessageHandler};
-pub use crate::messages::portfolio::document::overlays::{OverlaysMessage, OverlaysMessageContext, OverlaysMessageDiscriminant, OverlaysMessageHandler};
-pub use crate::messages::portfolio::document::properties_panel::{PropertiesPanelMessage, PropertiesPanelMessageDiscriminant, PropertiesPanelMessageHandler};
-pub use crate::messages::portfolio::document::{DocumentMessage, DocumentMessageContext, DocumentMessageDiscriminant, DocumentMessageHandler};
-pub use crate::messages::portfolio::menu_bar::{MenuBarMessage, MenuBarMessageDiscriminant, MenuBarMessageHandler};
+pub use crate::messages::portfolio::document::graph_operation::{GraphOperationMessage, GraphOperationMessageContext, GraphOperationMessageDiscriminant, GraphOperationMessageHandler}; pub use crate::messages::portfolio::document::navigation::{NavigationMessage, NavigationMessageContext, NavigationMessageDiscriminant, NavigationMessageHandler}; pub use crate::messages::portfolio::document::node_graph::{NodeGraphMessage, NodeGraphMessageDiscriminant, NodeGraphMessageHandler}; pub use crate::messages::portfolio::document::overlays::{OverlaysMessage, OverlaysMessageContext, OverlaysMessageDiscriminant, OverlaysMessageHandler}; pub use crate::messages::portfolio::document::properties_panel::{PropertiesPanelMessage, PropertiesPanelMessageDiscriminant, PropertiesPanelMessageHandler}; pub use crate::messages::portfolio::document::{DocumentMessage, DocumentMessageContext, DocumentMessageDiscriminant, DocumentMessageHandler}; pub use crate::messages::portfolio::menu_bar::{MenuBarMessage, MenuBarMessageDiscriminant, MenuBarMessageHandler};
 pub use crate::messages::portfolio::spreadsheet::{SpreadsheetMessage, SpreadsheetMessageDiscriminant};
 pub use crate::messages::portfolio::{PortfolioMessage, PortfolioMessageContext, PortfolioMessageDiscriminant, PortfolioMessageHandler};
 pub use crate::messages::preferences::{PreferencesMessage, PreferencesMessageDiscriminant, PreferencesMessageHandler};
@@ -49,7 +43,6 @@ pub use crate::messages::tool::tool_messages::text_tool::{TextToolMessage, TextT
 // Helper
 pub use crate::messages::globals::global_variables::*;
 pub use crate::messages::portfolio::document::utility_types::misc::DocumentId;
-pub use crate::messages::frontend::FrontendHtmlCanvases;
 pub use graphite_proc_macros::*;
 pub use std::collections::{HashMap, HashSet, VecDeque};
 

editor/src/node_graph_executor.rs

@@ -350,13 +350,9 @@ impl NodeGraphExecutor {
 		match node_graph_output {
 			TaggedValue::RenderOutput(render_output) => {
 				match render_output.data {
-					graphene_std::wasm_application_io::RenderOutputType::Svg { svg, image_data, canvas } => {
+					graphene_std::wasm_application_io::RenderOutputType::Svg { svg, image_data } => {
 						// Send to frontend
-						#[cfg(target_arch = "wasm32")]
-						if !image_data.is_empty() {
-							let canvases = draw_image_frame(image_data, canvas.0.unwrap());
-							responses.add(FrontendMessage::UpdateCanvasImage { canvases });
-						}
+						responses.add(FrontendMessage::UpdateImageData { image_data });
 						responses.add(FrontendMessage::UpdateDocumentArtwork { svg });
 					}
 					graphene_std::wasm_application_io::RenderOutputType::CanvasFrame(frame) => {
@@ -398,73 +394,6 @@ impl NodeGraphExecutor {
 	}
 }
 
-#[cfg(target_arch = "wasm32")]
-use graph_craft::wasm_application_io::WasmSurfaceHandle;
-#[cfg(target_arch = "wasm32")]
-use graphene_std::Color;
-#[cfg(target_arch = "wasm32")]
-use graphene_std::application_io;
-#[cfg(target_arch = "wasm32")]
-use graphene_std::raster::{Image, TransformImage};
-#[cfg(target_arch = "wasm32")]
-use js_sys::{Object, Reflect};
-#[cfg(target_arch = "wasm32")]
-use std::sync::Arc;
-#[cfg(target_arch = "wasm32")]
-use wasm_bindgen::Clamped;
-#[cfg(target_arch = "wasm32")]
-use wasm_bindgen::JsCast;
-#[cfg(target_arch = "wasm32")]
-use wasm_bindgen::JsValue;
-#[cfg(target_arch = "wasm32")]
-use web_sys::CanvasRenderingContext2d;
-#[cfg(target_arch = "wasm32")]
-use web_sys::HtmlCanvasElement;
-
-#[cfg(target_arch = "wasm32")]
-fn draw_image_frame(images: Vec<(u64, Image<Color>, TransformImage)>, surface_handle: Arc<WasmSurfaceHandle>) -> FrontendHtmlCanvases {
-	let mut canvases = Vec::new();
-	let window = web_sys::window().expect("No window object exists");
-	let image_canvases_key = JsValue::from_str("imageCanvases");
-	let image_canvases_obj = match Reflect::get(&window, &image_canvases_key) {
-		Ok(obj) if !obj.is_undefined() => obj.dyn_into::<Object>().expect("window.imageCanvases is not an object"),
-		_ => {
-			let new_obj = Object::new();
-			Reflect::set(&window, &image_canvases_key, &new_obj).expect("Failed to set window.imageCanvases");
-			new_obj
-		}
-	};
-
-	for (id, image, transform) in images {
-		let image_data_rgba8: Vec<u8> = image.data.iter().flat_map(|color| color.to_rgba8_srgb()).collect();
-
-		let array: Clamped<&[u8]> = Clamped(&image_data_rgba8);
-		if image.width > 0 && image.height > 0 {
-			let document = window.document().expect("should have a document on window");
-			let canvas_element = document
-				.create_element("canvas")
-				.expect("failed to create canvas element")
-				.dyn_into::<HtmlCanvasElement>()
-				.expect("failed to cast to canvas element");
-
-			canvas_element.set_width(1);
-			canvas_element.set_height(1);
-			let context = canvas_element.get_context("2d").unwrap().unwrap().dyn_into::<CanvasRenderingContext2d>().unwrap();
-
-			let image_data = web_sys::ImageData::new_with_u8_clamped_array_and_sh(array, image.width, image.height).expect("Failed to construct ImageData");
-			context.put_image_data(&image_data, 0., 0.).unwrap();
-			let canvas_name = format!("canvas{}", id);
-			Reflect::set(&image_canvases_obj, &JsValue::from_str(&canvas_name), &canvas_element).expect("Failed to set canvas on imageCanvases object");
-		}
-
-		let transform = transform.0;
-		let surface_handle = surface_handle.clone();
-		let canvas_frame = application_io::SurfaceHandleFrame { surface_handle, transform };
-		canvases.push(canvas_frame);
-	}
-	FrontendHtmlCanvases(canvases)
-}
-
 // Re-export for usage by tests in other modules
 #[cfg(test)]
 pub use test::Instrumented;

frontend/src/messages.ts

@@ -689,8 +689,6 @@ export class UpdateDocumentArtwork extends JsMessage {
 	readonly svg!: string;
 }
 
-export class UpdateCanvasImage extends JsMessage {}
-
 export class UpdateDocumentScrollbars extends JsMessage {
 	@TupleToVec2
 	readonly position!: XY;
@@ -1658,7 +1656,6 @@ export const messageMakers: Record<string, MessageMaker> = {
 	UpdateDialogColumn1,
 	UpdateDialogColumn2,
 	UpdateDocumentArtwork,
-	UpdateCanvasImage,
 	UpdateDocumentBarLayout,
 	UpdateDocumentLayerDetails,
 	UpdateDocumentLayerStructureJs,

node-graph/gcore/src/raster/image.rs

@@ -50,7 +50,7 @@ pub struct Image<P: Pixel> {
 	// TODO: Currently it is always anchored at the top left corner at (0, 0). The bottom right corner of the new origin field would correspond to (1, 1).
 }
 
-#[derive(Debug, Clone, dyn_any::DynAny, Default, PartialEq, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, dyn_any::DynAny, Default, PartialEq, serde::Serialize, serde::Deserialize, specta::Type)]
 pub struct TransformImage(pub DAffine2);
 
 impl Hash for TransformImage {

node-graph/graph-craft/src/document/value.rs

@@ -1,6 +1,6 @@
 use super::DocumentNode;
 use crate::proto::{Any as DAny, FutureAny};
-use crate::wasm_application_io::{WasmCanvas, WasmEditorApi};
+use crate::wasm_application_io::WasmEditorApi;
 use dyn_any::DynAny;
 pub use dyn_any::StaticType;
 pub use glam::{DAffine2, DVec2, IVec2, UVec2};
@@ -429,12 +429,7 @@ pub struct RenderOutput {
 #[derive(Debug, Clone, Hash, PartialEq, dyn_any::DynAny, serde::Serialize, serde::Deserialize)]
 pub enum RenderOutputType {
 	CanvasFrame(SurfaceFrame),
-	Svg {
-		svg: String,
-		image_data: Vec<(u64, Image<Color>, TransformImage)>,
-		#[serde(skip)]
-		canvas: WasmCanvas,
-	},
+	Svg { svg: String, image_data: Vec<(u64, Image<Color>, TransformImage)> },
 	Image(Vec<u8>),
 }
 

node-graph/graph-craft/src/wasm_application_io.rs

@@ -314,33 +314,13 @@ impl ApplicationIo for WasmApplicationIo {
 #[cfg(feature = "wgpu")]
 pub type WasmSurfaceHandle = SurfaceHandle<wgpu_executor::Window>;
 #[cfg(feature = "wgpu")]
-#[derive(Debug, Clone, dyn_any::DynAny, Default)]
-pub struct WasmCanvas(pub Option<Arc<WasmSurfaceHandle>>);
-#[cfg(feature = "wgpu")]
 pub type WasmSurfaceHandleFrame = graphene_application_io::SurfaceHandleFrame<wgpu_executor::Window>;
 
-#[cfg(feature = "wgpu")]
-unsafe impl Send for WasmCanvas {}
-#[cfg(feature = "wgpu")]
-unsafe impl Sync for WasmCanvas {}
-
 #[derive(Clone, Debug, PartialEq, Hash, specta::Type, serde::Serialize, serde::Deserialize)]
 pub struct EditorPreferences {
 	pub use_vello: bool,
 }
 
-#[cfg(feature = "wgpu")]
-impl Hash for WasmCanvas {
-	fn hash<H: std::hash::Hasher>(&self, _: &mut H) {}
-}
-
-#[cfg(feature = "wgpu")]
-impl PartialEq for WasmCanvas {
-	fn eq(&self, _: &Self) -> bool {
-		true
-	}
-}
-
 impl graphene_application_io::GetEditorPreferences for EditorPreferences {
 	fn use_vello(&self) -> bool {
 		self.use_vello

node-graph/gstd/src/wasm_application_io.rs

@@ -64,7 +64,7 @@ fn decode_image(_: impl Ctx, data: Arc<[u8]>) -> RasterDataTable<CPU> {
 	RasterDataTable::new(Raster::new_cpu(image))
 }
 
-fn render_svg(data: impl GraphicElementRendered, mut render: SvgRender, render_params: RenderParams, footprint: Footprint, editor: &WasmEditorApi) -> RenderOutputType {
+fn render_svg(data: impl GraphicElementRendered, mut render: SvgRender, render_params: RenderParams, footprint: Footprint) -> RenderOutputType {
 	if !data.contains_artboard() && !render_params.hide_artboards {
 		render.leaf_tag("rect", |attributes| {
 			attributes.push("x", "0");
@@ -85,9 +85,7 @@ fn render_svg(data: impl GraphicElementRendered, mut render: SvgRender, render_p
 
 	let svg = render.svg.to_svg_string();
 	let image_data = render.image_data;
-	let canvas = (!image_data.is_empty()).then_some(Arc::new(editor.application_io.as_ref().unwrap().create_window()));
-	let canvas = WasmCanvas(canvas);
-	RenderOutputType::Svg { svg, image_data, canvas }
+	RenderOutputType::Svg { svg, image_data }
 }
 
 #[cfg(feature = "vello")]
@@ -257,7 +255,7 @@ async fn render<'a: 'n, T: 'n + GraphicElementRendered + WasmNotSend>(
 
 	let output_format = render_config.export_format;
 	let data = match output_format {
-		ExportFormat::Svg => render_svg(data, SvgRender::new(), render_params, footprint, editor_api),
+		ExportFormat::Svg => render_svg(data, SvgRender::new(), render_params, footprint),
 		ExportFormat::Canvas => {
 			if use_vello && editor_api.application_io.as_ref().unwrap().gpu_executor().is_some() {
 				#[cfg(all(feature = "vello", not(test)))]
@@ -266,9 +264,9 @@ async fn render<'a: 'n, T: 'n + GraphicElementRendered + WasmNotSend>(
 					metadata,
 				};
 				#[cfg(any(not(feature = "vello"), test))]
-				render_svg(data, SvgRender::new(), render_params, footprint, editor_api)
+				render_svg(data, SvgRender::new(), render_params, footprint)
 			} else {
-				render_svg(data, SvgRender::new(), render_params, footprint, editor_api)
+				render_svg(data, SvgRender::new(), render_params, footprint)
 			}
 		}
 		_ => todo!("Non-SVG render output for {output_format:?}"),