-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Screenshots in wasm #8455
Merged
Merged
Screenshots in wasm #8455
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,10 +71,47 @@ impl ScreenshotManager { | |
// discard the alpha channel which stores brightness values when HDR is enabled to make sure | ||
// the screenshot looks right | ||
let img = dyn_img.to_rgb8(); | ||
#[cfg(not(target_arch = "wasm32"))] | ||
match img.save_with_format(&path, format) { | ||
Ok(_) => info!("Screenshot saved to {}", path.display()), | ||
Err(e) => error!("Cannot save screenshot, IO error: {e}"), | ||
} | ||
|
||
#[cfg(target_arch = "wasm32")] | ||
{ | ||
match (|| { | ||
use image::EncodableLayout; | ||
use wasm_bindgen::{JsCast, JsValue}; | ||
|
||
let mut image_buffer = std::io::Cursor::new(Vec::new()); | ||
img.write_to(&mut image_buffer, format) | ||
.map_err(|e| JsValue::from_str(&format!("{e}")))?; | ||
// SAFETY: `image_buffer` only exist in this closure, and is not used after this line | ||
let parts = js_sys::Array::of1(&unsafe { | ||
js_sys::Uint8Array::view(image_buffer.into_inner().as_bytes()) | ||
.into() | ||
}); | ||
let blob = web_sys::Blob::new_with_u8_array_sequence(&parts)?; | ||
let url = web_sys::Url::create_object_url_with_blob(&blob)?; | ||
let window = web_sys::window().unwrap(); | ||
let document = window.document().unwrap(); | ||
let link = document.create_element("a")?; | ||
link.set_attribute("href", &url)?; | ||
link.set_attribute( | ||
"download", | ||
path.file_name() | ||
.and_then(|filename| filename.to_str()) | ||
.ok_or_else(|| JsValue::from_str("Invalid filename"))?, | ||
)?; | ||
let html_element = link.dyn_into::<web_sys::HtmlElement>()?; | ||
html_element.click(); | ||
web_sys::Url::revoke_object_url(&url)?; | ||
Ok::<(), JsValue>(()) | ||
})() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The syntax for "try/catch" in rust is very unusual 🙂 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you... get used to it. and it provides nice scoping |
||
Ok(_) => info!("Screenshot saved to {}", path.display()), | ||
Err(e) => error!("Cannot save screenshot, error: {e:?}"), | ||
}; | ||
} | ||
} | ||
Err(e) => error!("Cannot save screenshot, requested format not recognized: {e}"), | ||
}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will including more web-sys features meaningfully affect our wasm build sizes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just tried a build, it's 14kB smaller with this PR. Build duration were similar
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amazing that it got smaller by adding features. Works for me