diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 486e94bba07..bbdec47a6d3 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -29,7 +29,7 @@ use geom::point::{Point2D, TypedPoint2D}; use geom::rect::{Rect, TypedRect}; use geom::size::TypedSize2D; use geom::scale_factor::ScaleFactor; -use gfx::render_task::{RenderChan, RenderMsg, RenderRequest, UnusedBufferMsg}; +use gfx::paint_task::{RenderChan, RenderMsg, RenderRequest, UnusedBufferMsg}; use layers::geometry::{DevicePixel, LayerPixel}; use layers::layers::{BufferRequest, Layer, LayerBufferSet}; use layers::rendergl; diff --git a/components/compositing/compositor_layer.rs b/components/compositing/compositor_layer.rs index b830e630f34..6e570f69f62 100644 --- a/components/compositing/compositor_layer.rs +++ b/components/compositing/compositor_layer.rs @@ -14,7 +14,7 @@ use geom::matrix::identity; use geom::point::{Point2D, TypedPoint2D}; use geom::size::{Size2D, TypedSize2D}; use geom::rect::Rect; -use gfx::render_task::UnusedBufferMsg; +use gfx::paint_task::UnusedBufferMsg; use layers::color::Color; use layers::geometry::LayerPixel; use layers::layers::{Layer, LayerBufferSet}; diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 71a32fca6e1..d2b8cf9892c 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -10,7 +10,7 @@ use devtools_traits::DevtoolsControlChan; use geom::rect::{Rect, TypedRect}; use geom::scale_factor::ScaleFactor; use gfx::font_cache_task::FontCacheTask; -use gfx::render_task; +use gfx::paint_task; use layers::geometry::DevicePixel; use layout_traits::{LayoutControlChan, LayoutTaskFactory, ExitNowMsg}; use libc; @@ -506,7 +506,7 @@ impl Constellation { fn force_pipeline_exit(old_pipeline: &Rc) { let ScriptControlChan(ref old_script) = old_pipeline.script_chan; let _ = old_script.send_opt(ExitPipelineMsg(old_pipeline.id)); - let _ = old_pipeline.render_chan.send_opt(render_task::ExitMsg(None)); + let _ = old_pipeline.render_chan.send_opt(paint_task::ExitMsg(None)); let LayoutControlChan(ref old_layout) = old_pipeline.layout_chan; let _ = old_layout.send_opt(ExitNowMsg); } diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index e6972d1361b..118d2424094 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -8,8 +8,8 @@ use script_traits::{ScriptControlChan, ScriptTaskFactory}; use script_traits::{AttachLayoutMsg, LoadMsg, NewLayoutInfo, ExitPipelineMsg}; use devtools_traits::DevtoolsControlChan; -use gfx::render_task::{PaintPermissionGranted, PaintPermissionRevoked}; -use gfx::render_task::{RenderChan, RenderTask}; +use gfx::paint_task::{PaintPermissionGranted, PaintPermissionRevoked}; +use gfx::paint_task::{RenderChan, RenderTask}; use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId}; use servo_msg::constellation_msg::{LoadData, WindowSizeData}; use servo_net::image_cache_task::ImageCacheTask; diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 68b0e3d38ed..195989ba5e9 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -24,7 +24,7 @@ use azure::azure::AzFloat; use collections::dlist::{mod, DList}; use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D}; use libc::uintptr_t; -use render_task::RenderLayer; +use paint_task::RenderLayer; use script_traits::UntrustedNodeAddress; use servo_msg::compositor_msg::LayerId; use servo_net::image::base::Image; diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 701390e072c..bc095e2aa55 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -59,7 +59,7 @@ mod render_context; pub mod color; #[path="display_list/mod.rs"] pub mod display_list; -pub mod render_task; +pub mod paint_task; // Fonts pub mod font; diff --git a/components/gfx/render_task.rs b/components/gfx/paint_task.rs similarity index 100% rename from components/gfx/render_task.rs rename to components/gfx/paint_task.rs diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 56eb4e4cf34..79866baa1ad 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -30,7 +30,7 @@ use gfx::display_list::{ImageDisplayItem, ImageDisplayItemClass, LineDisplayItem use gfx::display_list::{LineDisplayItemClass, PseudoDisplayItemClass, SidewaysLeft, SidewaysRight}; use gfx::display_list::{SolidColorDisplayItem, SolidColorDisplayItemClass, StackingContext}; use gfx::display_list::{TextDisplayItem, TextDisplayItemClass, Upright}; -use gfx::render_task::RenderLayer; +use gfx::paint_task::RenderLayer; use servo_msg::compositor_msg::{FixedPosition, Scrollable}; use servo_msg::constellation_msg::{ConstellationChan, FrameRectMsg}; use servo_net::image::holder::ImageHolder; diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 5a7b7011f99..9b5f4a00f22 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -28,7 +28,7 @@ use geom::scale_factor::ScaleFactor; use gfx::color; use gfx::display_list::{DisplayList, OpaqueNode, StackingContext}; use gfx::font_cache_task::FontCacheTask; -use gfx::render_task::{mod, RenderInitMsg, RenderChan, RenderLayer}; +use gfx::paint_task::{mod, RenderInitMsg, RenderChan, RenderLayer}; use layout_traits; use layout_traits::{LayoutControlMsg, LayoutTaskFactory}; use log; @@ -463,7 +463,7 @@ impl LayoutTask { LayoutTask::return_rw_data(possibly_locked_rw_data, rw_data); } - self.render_chan.send(render_task::ExitMsg(Some(response_chan))); + self.render_chan.send(paint_task::ExitMsg(Some(response_chan))); response_port.recv() } diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index 9c662a5c3a5..d08de4cc01c 100644 --- a/components/layout_traits/lib.rs +++ b/components/layout_traits/lib.rs @@ -20,7 +20,7 @@ extern crate "util" as servo_util; // that these modules won't have to depend on layout. use gfx::font_cache_task::FontCacheTask; -use gfx::render_task::RenderChan; +use gfx::paint_task::RenderChan; use servo_msg::constellation_msg::{ConstellationChan, PipelineId}; use servo_msg::constellation_msg::Failure; use servo_net::image_cache_task::ImageCacheTask;