Merge mozilla-central to autoland. a=merge

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/7d6e31f4595724bff0c5a86d768209917f8e826d
servo · Feb 28, 2024 · 3ef9354 · 3ef9354
2 parents 9d802da + 8ddce6f
commit 3ef9354
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/webrender/src/picture.rs b/webrender/src/picture.rs
@@ -5014,7 +5014,7 @@ impl PicturePrimitive {
 
                                     let content_device_rect = content_device_rect
                                         .intersection(&max_content_rect)
-                                        .expect("bug: no intersection with tile dirty rect: {content_device_rect:?} / {max_content_rect:?}");
+                                        .expect("bug: no intersection with tile dirty rect");
 
                                     let content_task_size = content_device_rect.size();
                                     let normalized_content_rect = content_task_size.into();

diff --git a/webrender/src/render_task.rs b/webrender/src/render_task.rs
@@ -940,7 +940,6 @@ impl RenderTask {
         size: DeviceIntSize,
         kind: RenderTaskKind,
     ) -> Self {
-        assert!(!size.is_empty());
         RenderTask::new(
             RenderTaskLocation::Unallocated { size },
             kind,

diff --git a/webrender/src/renderer/upload.rs b/webrender/src/renderer/upload.rs
@@ -660,7 +660,7 @@ impl UploadTexturePool {
             ImageFormat::RGBA8 => 0,
             ImageFormat::BGRA8 => 1,
             ImageFormat::R8 => 2,
-            _ => { panic!("unexpected format {:?}", format); }
+            _ => { panic!("unexpected format"); }
         }
     }