compositor: Rename RenderingGroupId to PainterId (servo#40307)

And let the Compositor create the `PainterId` when it creates a new
`Painter`. Also make inline formatting code take `LayoutContext` rather
than threading it via the `InlineFormattingContextBuilder`.


Testing: Should preserve existing behavior, so covered by existing
tests.

Signed-off-by: Mukilan Thiyagarajan <[email protected]>
Co-authored-by: Martin Robinson <[email protected]>

Author: mukilan

components/compositing/compositor.rs

@@ -10,7 +10,7 @@ use std::sync::{Arc, Mutex};
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use base::generic_channel::RoutedReceiver;
-use base::id::WebViewId;
+use base::id::{PainterId, WebViewId};
 use bitflags::bitflags;
 use canvas_traits::webgl::WebGLThreads;
 use compositing_traits::{CompositorMsg, WebRenderExternalImageRegistry, WebViewTrait};
@@ -132,6 +132,10 @@ impl IOCompositor {
         self.painters[0].borrow_mut()
     }
 
+    pub fn painter_id(&self) -> PainterId {
+        self.painters[0].borrow().painter_id
+    }
+
     pub fn deinit(&mut self) {
         for painter in &self.painters {
             painter.borrow_mut().deinit();
@@ -330,7 +334,7 @@ impl IOCompositor {
                 number_of_font_keys,
                 number_of_font_instance_keys,
                 result_sender,
-                _rendering_group_id,
+                _painter_id,
             ) => {
                 let _ = result_sender.send(
                     self.painter_mut()
@@ -419,7 +423,7 @@ impl IOCompositor {
                 number_of_font_keys,
                 number_of_font_instance_keys,
                 result_sender,
-                _rendering_group_id,
+                _painter_id,
             ) => {
                 let _ = result_sender.send(
                     self.painter_mut()

components/compositing/painter.rs

@@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
 
 use base::Epoch;
 use base::cross_process_instant::CrossProcessInstant;
-use base::id::{PipelineId, WebViewId};
+use base::id::{PainterId, PipelineId, WebViewId};
 use canvas_traits::webgl::{GlType, WebGLThreads};
 use compositing_traits::display_list::{CompositorDisplayListInfo, ScrollType};
 use compositing_traits::largest_contentful_paint_candidate::LCPCandidate;
@@ -81,6 +81,9 @@ pub(crate) struct Painter {
     /// The [`RenderingContext`] instance that webrender targets, which is the viewport.
     pub(crate) rendering_context: Rc<dyn RenderingContext>,
 
+    /// The ID of this painter.
+    pub(crate) painter_id: PainterId,
+
     /// Our [`WebViewRenderer`]s, one for every `WebView`.
     pub(crate) webview_renderers: WebViewManager<WebViewRenderer>,
 
@@ -289,6 +292,7 @@ impl Painter {
         info!("Running on {gl_renderer} with OpenGL version {gl_version}");
 
         let painter = Painter {
+            painter_id: PainterId::next(),
             embedder_to_constellation_sender,
             webview_renderers: Default::default(),
             rendering_context,

components/compositing/webview_manager.rs

@@ -122,7 +122,10 @@ impl WebViewManager<WebViewRenderer> {
 
 #[cfg(test)]
 mod test {
-    use base::id::{BrowsingContextId, Index, PipelineNamespace, PipelineNamespaceId, WebViewId};
+    use base::id::{
+        BrowsingContextId, Index, PipelineNamespace, PipelineNamespaceId, TEST_PAINTER_ID,
+        WebViewId,
+    };
 
     use crate::webview_manager::WebViewManager;
     use crate::webview_renderer::UnknownWebView;
@@ -150,9 +153,10 @@ mod test {
         let mut webviews = WebViewManager::default();
 
         // entry() adds the webview to the map, but not the painting order.
-        webviews.entry(WebViewId::new()).or_insert('a');
-        webviews.entry(WebViewId::new()).or_insert('b');
-        webviews.entry(WebViewId::new()).or_insert('c');
+        let painter_id = TEST_PAINTER_ID;
+        webviews.entry(WebViewId::new(painter_id)).or_insert('a');
+        webviews.entry(WebViewId::new(painter_id)).or_insert('b');
+        webviews.entry(WebViewId::new(painter_id)).or_insert('c');
         assert!(webviews.get(webview_id(0, 1)).is_some());
         assert!(webviews.get(webview_id(0, 2)).is_some());
         assert!(webviews.get(webview_id(0, 3)).is_some());

components/constellation/webview_manager.rs

@@ -83,7 +83,10 @@ impl<WebView> WebViewManager<WebView> {
 
 #[cfg(test)]
 mod test {
-    use base::id::{BrowsingContextId, Index, PipelineNamespace, PipelineNamespaceId, WebViewId};
+    use base::id::{
+        BrowsingContextId, Index, PipelineNamespace, PipelineNamespaceId, TEST_PAINTER_ID,
+        WebViewId,
+    };
 
     use crate::webview_manager::WebViewManager;
 
@@ -119,9 +122,9 @@ mod test {
         let mut webviews = WebViewManager::default();
 
         // add() adds the webview to the map, but does not focus it.
-        webviews.add(WebViewId::new(), 'a');
-        webviews.add(WebViewId::new(), 'b');
-        webviews.add(WebViewId::new(), 'c');
+        webviews.add(WebViewId::new(TEST_PAINTER_ID), 'a');
+        webviews.add(WebViewId::new(TEST_PAINTER_ID), 'b');
+        webviews.add(WebViewId::new(TEST_PAINTER_ID), 'c');
         assert_eq!(
             webviews_sorted(&webviews),
             vec![(id(0, 1), 'a'), (id(0, 2), 'b'), (id(0, 3), 'c'),]

components/devtools/id.rs

@@ -158,7 +158,7 @@ pub(crate) fn test_id_map() {
 
     test_sequential_id_assignment!(
         DevtoolsBrowserId,
-        || WebViewId::new(),
+        || WebViewId::new(base::id::TEST_PAINTER_ID),
         |id_map: &mut IdMap, id| id_map.browser_id(id)
     );
     test_sequential_id_assignment!(

components/fonts/font.rs

@@ -12,7 +12,7 @@ use std::time::Instant;
 use std::{iter, str};
 
 use app_units::Au;
-use base::id::RenderingGroupId;
+use base::id::PainterId;
 use bitflags::bitflags;
 use euclid::default::{Point2D, Rect};
 use euclid::num::Zero;
@@ -232,7 +232,7 @@ pub struct Font {
 
     shaper: OnceLock<Shaper>,
     cached_shape_data: RwLock<CachedShapeData>,
-    font_instance_key: RwLock<FxHashMap<RenderingGroupId, FontInstanceKey>>,
+    font_instance_key: RwLock<FxHashMap<PainterId, FontInstanceKey>>,
 
     /// If this is a synthesized small caps font, then this font reference is for
     /// the version of the font used to replace lowercase ASCII letters. It's up
@@ -326,16 +326,12 @@ impl Font {
         })
     }
 
-    pub fn key(
-        &self,
-        rendering_group_id: RenderingGroupId,
-        font_context: &FontContext,
-    ) -> FontInstanceKey {
+    pub fn key(&self, painter_id: PainterId, font_context: &FontContext) -> FontInstanceKey {
         *self
             .font_instance_key
             .write()
-            .entry(rendering_group_id)
-            .or_insert_with(|| font_context.create_font_instance_key(self, rendering_group_id))
+            .entry(painter_id)
+            .or_insert_with(|| font_context.create_font_instance_key(self, painter_id))
     }
 
     /// Return the data for this `Font`. Note that this is currently highly inefficient for system

components/fonts/font_context.rs

@@ -10,7 +10,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use app_units::Au;
-use base::id::{RenderingGroupId, WebViewId};
+use base::id::{PainterId, WebViewId};
 use compositing_traits::CrossProcessCompositorApi;
 use fonts_traits::{
     CSSFontFaceDescriptors, FontDescriptor, FontIdentifier, FontTemplate, FontTemplateRef,
@@ -286,22 +286,22 @@ impl FontContext {
     pub(crate) fn create_font_instance_key(
         &self,
         font: &Font,
-        rendering_group_id: RenderingGroupId,
+        painter_id: PainterId,
     ) -> FontInstanceKey {
         match font.template.identifier() {
             FontIdentifier::Local(_) => self.system_font_service_proxy.get_system_font_instance(
                 font.template.identifier(),
                 font.descriptor.pt_size,
                 font.webrender_font_instance_flags(),
                 font.variations().to_owned(),
-                rendering_group_id,
+                painter_id,
             ),
             FontIdentifier::Web(_) => self.create_web_font_instance(
                 font.template.clone(),
                 font.descriptor.pt_size,
                 font.webrender_font_instance_flags(),
                 font.variations().to_owned(),
-                rendering_group_id,
+                painter_id,
             ),
         }
     }
@@ -312,7 +312,7 @@ impl FontContext {
         pt_size: Au,
         flags: FontInstanceFlags,
         variations: Vec<FontVariation>,
-        rendering_group_id: RenderingGroupId,
+        painter_id: PainterId,
     ) -> FontInstanceKey {
         let identifier = font_template.identifier().clone();
         let font_data = self
@@ -323,9 +323,7 @@ impl FontContext {
             .write()
             .entry(identifier.clone())
             .or_insert_with(|| {
-                let font_key = self
-                    .system_font_service_proxy
-                    .generate_font_key(rendering_group_id);
+                let font_key = self.system_font_service_proxy.generate_font_key(painter_id);
                 self.compositor_api.lock().add_font(
                     font_key,
                     font_data.as_ipc_shared_memory(),
@@ -347,7 +345,7 @@ impl FontContext {
             .or_insert_with(|| {
                 let font_instance_key = self
                     .system_font_service_proxy
-                    .generate_font_instance_key(rendering_group_id);
+                    .generate_font_instance_key(painter_id);
                 self.compositor_api.lock().add_font_instance(
                     font_instance_key,
                     font_key,