Sync changes from mozilla-central gfx/wr

webrender/Cargo.toml

@@ -18,7 +18,7 @@ serialize_program = ["serde", "webrender_build/serialize_program"]
 dynamic_freetype = ["glyph_rasterizer/dynamic_freetype"]
 static_freetype = ["glyph_rasterizer/static_freetype"]
 leak_checks = []
-gecko = ["firefox-on-glean", "glyph_rasterizer/gecko"]
+gecko = ["firefox-on-glean", "glean", "glyph_rasterizer/gecko"]
 sw_compositor = ["swgl"]
 
 [build-dependencies]
@@ -52,7 +52,7 @@ svg_fmt = "0.4"
 tracy-rs = "0.1.2"
 derive_more = { version = "0.99", default-features = false, features = ["add_assign"] }
 etagere = "0.2.6"
-glean = "58.0.0"
+glean = { version = "58.1.0", optional = true }
 firefox-on-glean = { version = "0.1.0", optional = true }
 swgl = { path = "../swgl", optional = true }
 topological-sort = "0.1"

webrender/res/cs_border_segment.glsl

@@ -13,7 +13,7 @@ flat varying mediump vec4 vColor11;
 
 // A point + tangent defining the line where the edge
 // transition occurs. Used for corners only.
-flat varying mediump vec4 vColorLine;
+flat varying highp vec4 vColorLine;
 
 // x: segment, y: clip mode
 // We cast these to/from floats rather than using an ivec due to a driver bug
@@ -31,13 +31,13 @@ flat varying highp vec4 vClipCenter_Sign;
 
 // An outer and inner elliptical radii for border
 // corner clipping.
-flat varying mediump vec4 vClipRadii;
+flat varying highp vec4 vClipRadii;
 
 // Reference point for determine edge clip lines.
-flat varying mediump vec4 vEdgeReference;
+flat varying highp vec4 vEdgeReference;
 
 // Stores widths/2 and widths/3 to save doing this in FS.
-flat varying mediump vec4 vPartialWidths;
+flat varying highp vec4 vPartialWidths;
 
 // Clipping parameters for dot or dash.
 flat varying mediump vec4 vClipParams1;

webrender/res/render_task.glsl

@@ -82,21 +82,22 @@ struct ClipArea {
 };
 
 ClipArea fetch_clip_area(int index) {
-    ClipArea area;
-
+    RenderTaskData task_data;
     if (index >= CLIP_TASK_EMPTY) {
-        area.task_rect = RectWithEndpoint(vec2(0.0), vec2(0.0));
-        area.device_pixel_scale = 0.0;
-        area.screen_origin = vec2(0.0);
+      // We deliberately create a dummy RenderTaskData here then convert to a
+      // ClipArea after this if-else statement, rather than initialize the
+      // ClipArea in separate branches, to avoid a miscompile in some Adreno
+      // drivers. See bug 1884791. Unfortunately the specific details of the bug
+      // are unknown, so please take extra care not to regress this when
+      // refactoring.
+      task_data = RenderTaskData(RectWithEndpoint(vec2(0.0), vec2(0.0)),
+                                 vec4(0.0));
     } else {
-        RenderTaskData task_data = fetch_render_task_data(index);
-
-        area.task_rect = task_data.task_rect;
-        area.device_pixel_scale = task_data.user_data.x;
-        area.screen_origin = task_data.user_data.yz;
+      task_data = fetch_render_task_data(index);
     }
 
-    return area;
+    return ClipArea(task_data.task_rect, task_data.user_data.x,
+                    task_data.user_data.yz);
 }
 
 #endif //WR_VERTEX_SHADER

webrender/src/picture.rs

@@ -139,11 +139,11 @@ use std::collections::hash_map::Entry;
 use std::ops::Range;
 use crate::picture_textures::PictureCacheTextureHandle;
 use crate::util::{MaxRect, VecHelper, MatrixHelpers, Recycler, ScaleOffset};
-use crate::filterdata::{FilterDataHandle};
+use crate::filterdata::FilterDataHandle;
 use crate::tile_cache::{SliceDebugInfo, TileDebugInfo, DirtyTileDebugInfo};
 use crate::visibility::{PrimitiveVisibilityFlags, FrameVisibilityContext};
 use crate::visibility::{VisibilityState, FrameVisibilityState};
-use crate::scene_building::{SliceFlags};
+use crate::scene_building::SliceFlags;
 
 // Maximum blur radius for blur filter (different than box-shadow blur).
 // Taken from FilterNodeSoftware.cpp in Gecko.
@@ -3951,7 +3951,7 @@ impl SurfaceInfo {
         &self,
         local_rect: &PictureRect,
         spatial_tree: &SpatialTree,
-    ) -> Option<DeviceRect> {
+    ) -> Option<DeviceIntRect> {
         let local_rect = match local_rect.intersection(&self.clipping_rect) {
             Some(rect) => rect,
             None => return None,
@@ -3969,10 +3969,21 @@ impl SurfaceInfo {
 
             local_to_world.map(&local_rect).unwrap()
         } else {
+            // The content should have been culled out earlier.
+            assert!(self.device_pixel_scale.0 > 0.0);
+
             local_rect.cast_unit()
         };
 
-        Some((raster_rect * self.device_pixel_scale).round_out())
+        let surface_rect = (raster_rect * self.device_pixel_scale).round_out().to_i32();
+        if surface_rect.is_empty() {
+            // The local_rect computed above may have non-empty size that is very
+            // close to zero. Due to limited arithmetic precision, the SpaceMapper
+            // might transform the near-zero-sized rect into a zero-sized one.
+            return None;
+        }
+
+        Some(surface_rect)
     }
 }