fix: ImageInfo overflow check, add initial size builder and URL/title getters, HashMap for view tracking

Author: franzos

CHANGELOG.md

@@ -3,14 +3,19 @@
 ## [Unreleased]
 
 ### Added
+- `.with_initial_size()` builder method for setting viewport size before first resize
+- `current_url()` / `current_title()` getters on basic WebView
+- `url_for(id)` / `title_for(id)` getters on advanced WebView
 - Doc comments on WebView structs noting the required `Action::Update` subscription
 - Improved `on_action()` docs — now states it's required for litehtml/blitz engines
 
 ### Changed
+- Advanced WebView urls/titles tracking switched from Vec to HashMap for O(1) lookups
 - Reduced hot-path allocations — URL/title strings moved instead of cloned, pixel buffer avoids double copy
 - `on_action()` error messages now suggest the fix; doc comments name affected engines
 
 ### Fixed
+- ImageInfo::blank() integer overflow — checked arithmetic with fallback to 1x1
 - Widget crash on stale/invalid view index — lookups now return Option with graceful fallback
 - CEF pixel buffer integer overflow — checked arithmetic prevents buffer over-read on corrupted dimensions
 - Advanced widget HiDPI scaling — scroll offset and content height now scaled correctly

src/lib.rs

@@ -64,14 +64,7 @@ pub struct ImageInfo {
 
 impl Default for ImageInfo {
     fn default() -> Self {
-        let pixels = vec![255; (Self::WIDTH as usize * Self::HEIGHT as usize) * 4];
-        let raw_pixels = Arc::new(pixels.clone());
-        Self {
-            width: Self::WIDTH,
-            height: Self::HEIGHT,
-            handle: image::Handle::from_rgba(Self::WIDTH, Self::HEIGHT, pixels),
-            raw_pixels,
-        }
+        Self::blank(Self::WIDTH, Self::HEIGHT)
     }
 }
 
@@ -118,12 +111,17 @@ impl ImageInfo {
     }
 
     fn blank(width: u32, height: u32) -> Self {
-        let pixels = vec![255; (width as usize * height as usize) * 4];
+        let (w, h) = (width as usize)
+            .checked_mul(height as usize)
+            .and_then(|n| n.checked_mul(4))
+            .map_or((1u32, 1u32), |_| (width, height));
+
+        let pixels = vec![255; (w as usize * h as usize) * 4];
         let raw_pixels = Arc::new(pixels.clone());
         Self {
-            width,
-            height,
-            handle: image::Handle::from_rgba(width, height, pixels),
+            width: w,
+            height: h,
+            handle: image::Handle::from_rgba(w, h, pixels),
             raw_pixels,
         }
     }

src/webview/advanced.rs

@@ -74,9 +74,9 @@ where
     on_close_view: Option<Box<dyn Fn(ViewId) -> Message>>,
     on_create_view: Option<Box<dyn Fn(ViewId) -> Message>>,
     on_url_change: Option<Box<dyn Fn(ViewId, String) -> Message>>,
-    urls: Vec<(ViewId, String)>,
+    urls: HashMap<ViewId, String>,
     on_title_change: Option<Box<dyn Fn(ViewId, String) -> Message>>,
-    titles: Vec<(ViewId, String)>,
+    titles: HashMap<ViewId, String>,
     on_copy: Option<Box<dyn Fn(String) -> Message>>,
     action_mapper: Option<Arc<dyn Fn(Action) -> Message + Send + Sync>>,
     inflight_images: usize,
@@ -94,9 +94,9 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> Default
             on_close_view: None,
             on_create_view: None,
             on_url_change: None,
-            urls: Vec::new(),
+            urls: HashMap::new(),
             on_title_change: None,
-            titles: Vec::new(),
+            titles: HashMap::new(),
             on_copy: None,
             action_mapper: None,
             inflight_images: 0,
@@ -162,6 +162,13 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> WebView
         self
     }
 
+    /// Set the initial viewport size used before the first resize event.
+    /// Defaults to 1920x1080.
+    pub fn with_initial_size(mut self, size: Size<u32>) -> Self {
+        self.view_size = size;
+        self
+    }
+
     /// Passes update to webview
     pub fn update(&mut self, action: Action) -> Task<Message> {
         let mut tasks = Vec::new();
@@ -189,8 +196,8 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> WebView
         match action {
             Action::CloseView(id) => {
                 self.engine.remove_view(id);
-                self.urls.retain(|url| url.0 != id);
-                self.titles.retain(|title| title.0 != id);
+                self.urls.remove(&id);
+                self.titles.remove(&id);
 
                 if let Some(on_view_close) = &self.on_close_view {
                     tasks.push(Task::done((on_view_close)(id)))
@@ -226,8 +233,8 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> WebView
                     self.engine.new_view(self.view_size, Some(page_type))
                 };
 
-                self.urls.push((id, String::new()));
-                self.titles.push((id, String::new()));
+                self.urls.insert(id, String::new());
+                self.titles.insert(id, String::new());
 
                 if let Some(on_view_create) = &self.on_create_view {
                     tasks.push(Task::done((on_view_create)(id)))
@@ -466,6 +473,16 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> WebView
         Task::batch(tasks)
     }
 
+    /// Get the URL for a specific view
+    pub fn url_for(&self, id: ViewId) -> Option<&str> {
+        self.urls.get(&id).map(|s| s.as_str())
+    }
+
+    /// Get the title for a specific view
+    pub fn title_for(&self, id: ViewId) -> Option<&str> {
+        self.titles.get(&id).map(|s| s.as_str())
+    }
+
     /// Like a normal `view()` method in iced, but takes an id of the desired view
     pub fn view<'a, T: 'a>(&'a self, id: usize) -> Element<'a, Action, T> {
         let content_height = self.engine.get_content_height(id);

src/webview/basic.rs

@@ -185,6 +185,13 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> WebView
         self
     }
 
+    /// Set the initial viewport size used before the first resize event.
+    /// Defaults to 1920x1080.
+    pub fn with_initial_size(mut self, size: Size<u32>) -> Self {
+        self.view_size = size;
+        self
+    }
+
     /// Passes update to webview
     pub fn update(&mut self, action: Action) -> Task<Message> {
         let mut tasks = Vec::new();
@@ -569,6 +576,16 @@ impl<Engine: engines::Engine + Default, Message: Send + Clone + 'static> WebView
         self.get_current_view_id()
             .map(|id| self.engine.get_view(id))
     }
+
+    /// Get the current view's URL
+    pub fn current_url(&self) -> &str {
+        &self.url
+    }
+
+    /// Get the current view's title
+    pub fn current_title(&self) -> &str {
+        &self.title
+    }
 }
 
 struct WebViewWidget<'a> {