commit ebebe161729c1a4112e5546c5bd9f268f16224b8
parent ccc5cf33fd78c4806d7a1e35cded7e3edb86e2dc
Author: Nicolas Silva <nical@fastmail.com>
Date: Mon, 15 Dec 2025 10:53:21 +0000
Bug 1998913 - Part 6 - Extract subpixel mode boilerplate out of take_context. r=gfx-reviewers,gw
Differential Revision: https://phabricator.services.mozilla.com/D276147
Diffstat:
1 file changed, 72 insertions(+), 57 deletions(-)
diff --git a/gfx/wr/webrender/src/picture.rs b/gfx/wr/webrender/src/picture.rs
@@ -1613,63 +1613,11 @@ impl PicturePrimitive {
dirty_region_count += 1;
}
- // Disallow subpixel AA if an intermediate surface is needed.
- // TODO(lsalzman): allow overriding parent if intermediate surface is opaque
- let subpixel_mode = match self.raster_config {
- Some(RasterConfig { ref composite_mode, .. }) => {
- let subpixel_mode = match composite_mode {
- PictureCompositeMode::TileCache { slice_id } => {
- tile_caches[&slice_id].subpixel_mode
- }
- PictureCompositeMode::Blit(..) |
- PictureCompositeMode::ComponentTransferFilter(..) |
- PictureCompositeMode::Filter(..) |
- PictureCompositeMode::MixBlend(..) |
- PictureCompositeMode::IntermediateSurface |
- PictureCompositeMode::SVGFEGraph(..) => {
- // TODO(gw): We can take advantage of the same logic that
- // exists in the opaque rect detection for tile
- // caches, to allow subpixel text on other surfaces
- // that can be detected as opaque.
- SubpixelMode::Deny
- }
- };
-
- subpixel_mode
- }
- None => {
- SubpixelMode::Allow
- }
- };
-
- // Still disable subpixel AA if parent forbids it
- let subpixel_mode = match (parent_subpixel_mode, subpixel_mode) {
- (SubpixelMode::Allow, SubpixelMode::Allow) => {
- // Both parent and this surface unconditionally allow subpixel AA
- SubpixelMode::Allow
- }
- (SubpixelMode::Allow, SubpixelMode::Conditional { allowed_rect, prohibited_rect }) => {
- // Parent allows, but we are conditional subpixel AA
- SubpixelMode::Conditional {
- allowed_rect,
- prohibited_rect,
- }
- }
- (SubpixelMode::Conditional { allowed_rect, prohibited_rect }, SubpixelMode::Allow) => {
- // Propagate conditional subpixel mode to child pictures that allow subpixel AA
- SubpixelMode::Conditional {
- allowed_rect,
- prohibited_rect,
- }
- }
- (SubpixelMode::Conditional { .. }, SubpixelMode::Conditional { ..}) => {
- unreachable!("bug: only top level picture caches have conditional subpixel");
- }
- (SubpixelMode::Deny, _) | (_, SubpixelMode::Deny) => {
- // Either parent or this surface explicitly deny subpixel, these take precedence
- SubpixelMode::Deny
- }
- };
+ let subpixel_mode = compute_subpixel_mode(
+ &self.raster_config,
+ tile_caches,
+ parent_subpixel_mode
+ );
let context = PictureContext {
pic_index,
@@ -3029,6 +2977,73 @@ fn prepare_composite_mode(
)
}
+fn compute_subpixel_mode(
+ raster_config: &Option<RasterConfig>,
+ tile_caches: &FastHashMap<SliceId, Box<TileCacheInstance>>,
+ parent_subpixel_mode: SubpixelMode,
+) -> SubpixelMode {
+
+ // Disallow subpixel AA if an intermediate surface is needed.
+ // TODO(lsalzman): allow overriding parent if intermediate surface is opaque
+ let subpixel_mode = match raster_config {
+ Some(RasterConfig { ref composite_mode, .. }) => {
+ let subpixel_mode = match composite_mode {
+ PictureCompositeMode::TileCache { slice_id } => {
+ tile_caches[&slice_id].subpixel_mode
+ }
+ PictureCompositeMode::Blit(..) |
+ PictureCompositeMode::ComponentTransferFilter(..) |
+ PictureCompositeMode::Filter(..) |
+ PictureCompositeMode::MixBlend(..) |
+ PictureCompositeMode::IntermediateSurface |
+ PictureCompositeMode::SVGFEGraph(..) => {
+ // TODO(gw): We can take advantage of the same logic that
+ // exists in the opaque rect detection for tile
+ // caches, to allow subpixel text on other surfaces
+ // that can be detected as opaque.
+ SubpixelMode::Deny
+ }
+ };
+
+ subpixel_mode
+ }
+ None => {
+ SubpixelMode::Allow
+ }
+ };
+
+ // Still disable subpixel AA if parent forbids it
+ let subpixel_mode = match (parent_subpixel_mode, subpixel_mode) {
+ (SubpixelMode::Allow, SubpixelMode::Allow) => {
+ // Both parent and this surface unconditionally allow subpixel AA
+ SubpixelMode::Allow
+ }
+ (SubpixelMode::Allow, SubpixelMode::Conditional { allowed_rect, prohibited_rect }) => {
+ // Parent allows, but we are conditional subpixel AA
+ SubpixelMode::Conditional {
+ allowed_rect,
+ prohibited_rect,
+ }
+ }
+ (SubpixelMode::Conditional { allowed_rect, prohibited_rect }, SubpixelMode::Allow) => {
+ // Propagate conditional subpixel mode to child pictures that allow subpixel AA
+ SubpixelMode::Conditional {
+ allowed_rect,
+ prohibited_rect,
+ }
+ }
+ (SubpixelMode::Conditional { .. }, SubpixelMode::Conditional { ..}) => {
+ unreachable!("bug: only top level picture caches have conditional subpixel");
+ }
+ (SubpixelMode::Deny, _) | (_, SubpixelMode::Deny) => {
+ // Either parent or this surface explicitly deny subpixel, these take precedence
+ SubpixelMode::Deny
+ }
+ };
+
+ subpixel_mode
+}
+
#[test]
fn test_large_surface_scale_1() {
use crate::spatial_tree::{SceneSpatialTree, SpatialTree};
