Bug 1581058 - Rename scene_builder::SceneBuilder into scene_builder_thread::SceneBuilderThread. r=gw

Differential Revision: https://phabricator.services.mozilla.com/D45854

--HG--
rename : gfx/wr/webrender/src/scene_builder.rs => gfx/wr/webrender/src/scene_builder_thread.rs
extra : moz-landing-system : lando

gfx/wr/webrender/src/display_list_flattener.rs

@@ -38,7 +38,7 @@ use crate::prim_store::text_run::TextRun;
 use crate::render_backend::{DocumentView};
 use crate::resource_cache::{FontInstanceMap, ImageRequest};
 use crate::scene::{Scene, StackingContextHelpers};
-use crate::scene_builder::{DocumentStats, Interners};
+use crate::scene_builder_thread::{DocumentStats, Interners};
 use crate::spatial_node::{StickyFrameInfo, ScrollFrameKind};
 use std::{f32, mem, usize, ops};
 use std::collections::vec_deque::VecDeque;

gfx/wr/webrender/src/frame_builder.rs

@@ -32,7 +32,7 @@ use crate::render_task_graph::{RenderPassKind, RenderPass};
 use crate::render_task::{RenderTask, RenderTaskLocation, RenderTaskKind};
 use crate::resource_cache::{ResourceCache};
 use crate::scene::{ScenePipeline, SceneProperties};
-use crate::scene_builder::DocumentStats;
+use crate::scene_builder_thread::DocumentStats;
 use crate::segment::SegmentBuilder;
 use std::{f32, mem};
 use std::sync::Arc;

gfx/wr/webrender/src/lib.rs

@@ -115,7 +115,7 @@ mod render_task;
 mod renderer;
 mod resource_cache;
 mod scene;
-mod scene_builder;
+mod scene_builder_thread;
 mod screen_capture;
 mod segment;
 mod shade;

gfx/wr/webrender/src/render_backend.rs

@@ -46,7 +46,7 @@ use crate::resource_cache::PlainCacheOwn;
 #[cfg(any(feature = "capture", feature = "replay"))]
 use crate::resource_cache::PlainResources;
 use crate::scene::{Scene, SceneProperties};
-use crate::scene_builder::*;
+use crate::scene_builder_thread::*;
 #[cfg(feature = "serialize")]
 use serde::{Serialize, Deserialize};
 #[cfg(feature = "debugger")]

gfx/wr/webrender/src/renderer.rs

@@ -80,7 +80,7 @@ use crate::render_backend::{FrameId, RenderBackend};
 use crate::render_task_graph::RenderTaskGraph;
 use crate::render_task::{RenderTask, RenderTaskData, RenderTaskKind};
 use crate::resource_cache::ResourceCache;
-use crate::scene_builder::{SceneBuilder, LowPrioritySceneBuilder};
+use crate::scene_builder_thread::{SceneBuilderThread, LowPrioritySceneBuilderThread};
 use crate::screen_capture::AsyncScreenshotGrabber;
 use crate::shade::{Shaders, WrShaders};
 use smallvec::SmallVec;
@@ -2096,7 +2096,7 @@ impl Renderer {
         let lp_scene_thread_name = format!("WRSceneBuilderLP#{}", options.renderer_id.unwrap_or(0));
         let glyph_rasterizer = GlyphRasterizer::new(workers)?;
 
-        let (scene_builder, scene_tx, scene_rx) = SceneBuilder::new(
+        let (scene_builder, scene_tx, scene_rx) = SceneBuilderThread::new(
             config,
             api_tx.clone(),
             scene_builder_hooks,
@@ -2118,7 +2118,7 @@ impl Renderer {
 
         let low_priority_scene_tx = if options.support_low_priority_transactions {
             let (low_priority_scene_tx, low_priority_scene_rx) = channel();
-            let lp_builder = LowPrioritySceneBuilder {
+            let lp_builder = LowPrioritySceneBuilderThread {
                 rx: low_priority_scene_rx,
                 tx: scene_tx.clone(),
                 simulate_slow_ms: 0,

gfx/wr/webrender/src/scene_builder_thread.rs

@@ -266,7 +266,7 @@ impl Document {
     }
 }
 
-pub struct SceneBuilder {
+pub struct SceneBuilderThread {
     documents: FastHashMap<DocumentId, Document>,
     rx: Receiver<SceneBuilderRequest>,
     tx: Sender<SceneBuilderResult>,
@@ -277,7 +277,7 @@ pub struct SceneBuilder {
     size_of_ops: Option<MallocSizeOfOps>,
 }
 
-impl SceneBuilder {
+impl SceneBuilderThread {
     pub fn new(
         config: FrameBuilderConfig,
         api_tx: MsgSender<ApiMsg>,
@@ -287,7 +287,7 @@ impl SceneBuilder {
         let (in_tx, in_rx) = channel();
         let (out_tx, out_rx) = channel();
         (
-            SceneBuilder {
+            SceneBuilderThread {
                 documents: FastHashMap::default(),
                 rx: in_rx,
                 tx: out_tx,
@@ -641,13 +641,13 @@ impl SceneBuilder {
 ///
 /// After rasterizing blobs, the secene building request is forwarded to the normal scene
 /// builder where the FrameBuilder is generated.
-pub struct LowPrioritySceneBuilder {
+pub struct LowPrioritySceneBuilderThread {
     pub rx: Receiver<SceneBuilderRequest>,
     pub tx: Sender<SceneBuilderRequest>,
     pub simulate_slow_ms: u32,
 }
 
-impl LowPrioritySceneBuilder {
+impl LowPrioritySceneBuilderThread {
     pub fn run(&mut self) {
         loop {
             match self.rx.recv() {