me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use data urls instead of blob URLs

Browse source 
I didn't do this originally because I was half doing it in the first place to mess with Blob URLs, and it feels kinda wrong to be encoding it as base64 when that option is available. But not having memory leaks is more important.
This commit is contained in:
Liam Murphy 2021-04-10 17:18:04 +10:00
parent 99c56b9bff
commit 11f29bca86
No known key found for this signature in database
GPG key ID: 792DFA5B236BDF05
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
web/src/widget/image.rs
View file

@ -2,15 +2,11 @@
use crate::{Bus, Css, Element, Hasher, Length, Widget};
use dodrio::bumpalo;
use js_sys::Array;
use js_sys::Uint8Array;
use std::{
hash::{Hash, Hasher as _},
path::PathBuf,
sync::Arc,
};
use web_sys::Blob;
use web_sys::Url;
/// A frame that displays an image while keeping aspect ratio.
///
@ -79,18 +75,13 @@ impl<Message> Widget<Message> for Image {
let src = match self.handle.data.as_ref() {
Data::Path(path) => {
String::from_str_in(path.to_str().unwrap_or(""), bump)
.into_bump_str()
}
Data::Bytes(bytes) => bump.alloc(
Url::create_object_url_with_blob(
&Blob::new_with_u8_array_sequence(&Array::of1(
&Uint8Array::from(bytes.as_slice()),
))
.unwrap(),
)
.unwrap(),
),
};
Data::Bytes(bytes) => {
// The web is able to infer the kind of image, so we don't have to add a dependency on image-rs to guess the mime type.
bumpalo::format!(in bump, "data:;base64,{}", base64::encode(bytes))
},
}
.into_bump_str();
let alt = String::from_str_in(&self.alt, bump).into_bump_str();